2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

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

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-23 23:16:37 -07:00
4 changed files with 4 additions and 2 deletions
+1
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 {