Skip to content

B
bootstrap
Commit 49576704 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parent 40723c87
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
dist/css/bootstrap.css
View file @ 49576704
...@@ -2255,7 +2255,8 @@ input[type="button"].btn-block { ...@@ -2255,7 +2255,8 @@ input[type="button"].btn-block {
} }
.input-group-lg > .form-control, .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; height: 45px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
...@@ -2264,7 +2265,8 @@ input[type="button"].btn-block { ...@@ -2264,7 +2265,8 @@ input[type="button"].btn-block {
} }
.input-group-sm > .form-control, .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; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
......
dist/css/bootstrap.min.css
View file @ 49576704
This source diff could not be displayed because it is too large. You can view the blob instead.
less/input-groups.less
View file @ 49576704
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
// manipulation. // manipulation.
.input-group-lg > .form-control, .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 > .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 // Display as table-cell
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment