Skip to content

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

Merge pull request #9052 from liuyl/inputgroups 

fix #9051
parents 4582eb70 4bbbf774
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dist/css/bootstrap.css
View file @ 30a01e0a
......@@ -2104,12 +2104,14 @@ input[type="button"].btn-block {
.input-group-addon.input-small {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
.input-group-addon.input-large {
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 6px;
}
......@@ -3318,7 +3320,7 @@ button.close {
.pagination > li > a,
.pagination > li > span {
float: left;
padding: 4px 12px;
padding: 6px 12px;
line-height: 1.428571429;
text-decoration: none;
background-color: #ffffff;
......
dist/css/bootstrap.min.css
View file @ 30a01e0a
This source diff could not be displayed because it is too large. You can view the blob instead.
less/input-groups.less
View file @ 30a01e0a
......@@ -59,11 +59,13 @@
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
line-height: @line-height-small;
}
&.input-large {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
line-height: @line-height-large;
}
// Nuke default margins from checkboxes and radios to vertically center within.
......
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