aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-23 23:16:37 -0700
committerMark Otto <[email protected]>2013-08-23 23:16:37 -0700
commit0a2ec5545b499d87aca5b132ba7ac6bc5ede0949 (patch)
treed108b427e4a901257d7c7eacad0841cfe2a13dc6 /dist/css/bootstrap.css
parent99afaba2bfa5bcab8ee070477fba4b15db8d2af6 (diff)
parent9bdc841accb46e77a7f7347e82d0b19aea5703b6 (diff)
downloadbootstrap-0a2ec5545b499d87aca5b132ba7ac6bc5ede0949.tar.xz
bootstrap-0a2ec5545b499d87aca5b132ba7ac6bc5ede0949.zip
Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css1
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 5bd5e2667..5a84d87eb 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -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;