mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-10 23:54:08 +02:00
Code Issues Releases Wiki Activity

finish fixing #9295: add button group buttons to new input group sizing

Browse Source
This commit is contained in:
Mark Otto
2013-08-12 21:27:15 -07:00
parent 40723c8716
commit 49576704ea
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@@ -2255,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;
@@ -2264,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;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
less/input-groups.less
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