diff options
| author | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
| commit | 219f0fe7c54d6ece4fcfc58b140189c12e63f360 (patch) | |
| tree | 0355fdccf1ff8599f63a883dd4723c8d977e1e00 /less/input-groups.less | |
| parent | 0faf42b4bc3fd301beaa5b5f9b4d367f69899b05 (diff) | |
| parent | ac3cb6974ad0573812b65a2054a5809da9946cb6 (diff) | |
| download | bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.tar.xz bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.zip | |
Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/input-groups.less')
| -rw-r--r-- | less/input-groups.less | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/less/input-groups.less b/less/input-groups.less index 79d1afcd4..56c6cb62c 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -44,11 +44,10 @@ // Text input groups // ------------------------- .input-group-addon { - .box-sizing(border-box); padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; font-weight: normal; - line-height: @line-height-base; + line-height: 1; text-align: center; background-color: @gray-lighter; border: 1px solid @input-group-addon-border-color; @@ -59,13 +58,11 @@ padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; - line-height: @line-height-small; } &.input-lg { 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. |