mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Browse Source 
Conflicts:
	components.html
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-12 21:34:55 -07:00
parent 8bb7def26c 49576704ea
commit 80eb09cc1b
9 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/input-groups.less
+4 -2
View File
@@ -28,9 +28,11 @@
// manipulation.
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon { .input-lg(); }
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-lg(); }
.input-group-sm > .form-control,
.input-group-sm > .input-group-addon { .input-sm(); }
.input-group-sm > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-sm(); }
// Display as table-cell
less/scaffolding.less
+3 -1
View File
@@ -6,7 +6,9 @@
// Reset the box-sizing
// -------------------------
* {
*,
*:before,
*:after {
.box-sizing(border-box);
}