Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-03-25 08:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master

Browse source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-23 23:16:37 -07:00
commit 0a2ec5545b
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/js/raw-files.js
View file

File diff suppressed because one or more lines are too long

1
dist/css/bootstrap.css vendored
View file

@ -1578,6 +1578,7 @@ table th[class*="col-"] {
overflow-x: scroll;
overflow-y: hidden;
border: 1px solid #dddddd;
-webkit-overflow-scrolling: touch;
}
.table-responsive > .table {
margin-bottom: 0;

2
dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

1
less/tables.less
View file

@ -187,6 +187,7 @@ table {
overflow-y: hidden;
overflow-x: scroll;
border: 1px solid @table-border-color;
-webkit-overflow-scrolling: touch;
// Tighten up spacing and give a background color
> .table {