0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-10-14 13:45:57 -07:00
commit fa64846acf
3 changed files with 4 additions and 4 deletions

View File

@ -1757,7 +1757,7 @@ table th[class*="col-"] {
border-color: #f7e1b5;
}
@media (max-width: 768px) {
@media (max-width: 767px) {
.table-responsive {
width: 100%;
margin-bottom: 15px;

File diff suppressed because one or more lines are too long

View File

@ -171,10 +171,10 @@ table {
// by enabling horizontal scrolling. Only applies <768px. Everything above that
// will display normally.
@media (max-width: @screen-sm-min) {
@media (max-width: @screen-xs-max) {
.table-responsive {
width: 100%;
margin-bottom: 15px;
margin-bottom: (@line-height-computed * 0.75);
overflow-y: hidden;
overflow-x: scroll;
-ms-overflow-style: -ms-autohiding-scrollbar;