2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into gradient-prefix-cleanup

Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
This commit is contained in:
Mark Otto
2013-12-04 21:23:09 -08:00
20 changed files with 210 additions and 66 deletions
+2 -3
View File
@@ -122,13 +122,12 @@
// line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
.btn-sm,
.btn-xs {
.btn-sm {
// line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
.btn-xs {
padding: 1px 5px;
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
+3 -2
View File
@@ -547,9 +547,10 @@
// More easily include all the states for responsive-utilities.less.
.responsive-visibility() {
display: block !important;
tr& { display: table-row !important; }
table& { display: table; }
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
td& { display: table-cell !important; }
}
.responsive-invisibility() {
+4
View File
@@ -91,6 +91,10 @@
}
}
}
> .table-responsive {
border: 0;
margin-bottom: 0;
}
}
+3
View File
@@ -84,6 +84,9 @@
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-small: 1.5;