diff options
| author | Mark Otto <[email protected]> | 2013-02-02 17:31:26 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-02 17:31:26 -0800 |
| commit | 6993fadf7ec217608653ec5c0d4434ad8d8b2eb7 (patch) | |
| tree | a8b2d2b40537b73295dfdd64d412fcc6dd4d07b8 /less | |
| parent | 04aae2f56cca4438c90232b889fa5a6e1d78d223 (diff) | |
| download | bootstrap-6993fadf7ec217608653ec5c0d4434ad8d8b2eb7.tar.xz bootstrap-6993fadf7ec217608653ec5c0d4434ad8d8b2eb7.zip | |
Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 17 | ||||
| -rw-r--r-- | less/variables.less | 3 |
2 files changed, 5 insertions, 15 deletions
diff --git a/less/forms.less b/less/forms.less index 5480419a2..883bf1cf2 100644 --- a/less/forms.less +++ b/less/forms.less @@ -270,22 +270,15 @@ input[type="tel"], input[type="color"], .uneditable-input { &.input-large { - padding: @padding-large-input; + padding: @padding-large; font-size: @font-size-large; border-radius: @border-radius-large; - min-height: @input-height-large; } &.input-small { + min-height: @input-height-small; padding: @padding-small; font-size: @font-size-small; border-radius: @border-radius-small; - min-height: @input-height-small; - } - &.input-mini { - padding: @padding-mini; - font-size: @font-size-mini; - border-radius: @border-radius-small; - min-height: @input-height-small; } } @@ -480,7 +473,7 @@ select:focus:invalid { font-size: @font-size-small; } &.input-large { - padding: @padding-large-input; + padding: @padding-large; font-size: @font-size-large; } } @@ -492,11 +485,9 @@ select:focus:invalid { .border-left-radius(@border-radius-base); &.input-small { .border-left-radius(@border-radius-small); - .border-right-radius(0); } &.input-large { .border-left-radius(@border-radius-large); - .border-right-radius(0); } } .input-group-addon:first-child { @@ -508,11 +499,9 @@ select:focus:invalid { .border-right-radius(@border-radius-base); &.input-small { .border-right-radius(@border-radius-small); - .border-left-radius(0); } &.input-large { .border-right-radius(@border-radius-large); - .border-left-radius(0); } } .input-group-addon:last-child { diff --git a/less/variables.less b/less/variables.less index d72eee21f..4cdd12404 100644 --- a/less/variables.less +++ b/less/variables.less @@ -64,9 +64,10 @@ @padding-small: 2px 10px; // 26px @padding-mini: 0 6px; // 22px -@padding-large-input: 10px 14px; // 44px +/*@padding-large-input: 10px 14px; // 44px // firefox hack since it doesn't accept custom line-height for inputs and automatically sets line-height as font-size + 4 px. // input-large at 18 + 4 = 22, so I tried to compensate on padding. +*/ @border-radius-base: 4px; @border-radius-large: 6px; |