rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

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-x: scroll;
overflow-y: hidden; overflow-y: hidden;
border: 1px solid #dddddd; border: 1px solid #dddddd;
-webkit-overflow-scrolling: touch;
} }
.table-responsive > .table { .table-responsive > .table {
margin-bottom: 0; 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-y: hidden;
overflow-x: scroll; overflow-x: scroll;
border: 1px solid @table-border-color; border: 1px solid @table-border-color;
-webkit-overflow-scrolling: touch;
// Tighten up spacing and give a background color // Tighten up spacing and give a background color
> .table { > .table {