mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +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
dist/css/bootstrap.css
Vendored
+7 -3
View File
@@ -286,7 +286,9 @@ table {
}
}
* {
*,
*:before,
*:after {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@@ -2253,7 +2255,8 @@ input[type="button"].btn-block {
}
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon {
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 45px;
padding: 10px 16px;
font-size: 18px;
@@ -2262,7 +2265,8 @@ input[type="button"].btn-block {
}
.input-group-sm > .form-control,
.input-group-sm > .input-group-addon {
.input-group-sm > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 30px;
padding: 5px 10px;
font-size: 12px;