aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-14 23:21:30 -0700
committerMark Otto <[email protected]>2013-05-14 23:21:30 -0700
commit28a081cb20d4e9544967e7c6d5ab31ff4ad68862 (patch)
tree41d1af55e2055a91e79620b50594261a0eeda813 /less/forms.less
parenta41d566d5e38dd3227a0f5921f7be92969ff63f1 (diff)
downloadbootstrap-28a081cb20d4e9544967e7c6d5ab31ff4ad68862.tar.xz
bootstrap-28a081cb20d4e9544967e7c6d5ab31ff4ad68862.zip
Overhaul form control and button sizing, and some type styles
* New padding approach with separate horizontal and vertical padding variables * Improved sizing in large and small buttons and form controls * Dropped the `.btn-mini` (since we have no `.input-mini` to match, and holy fuck those were small buttons) * Dropped the `.pagination-mini` as well because once again, to hell with such small components * Changed `@line-height-headings` to `@headings-line-height` * Removed the `@headings-font-family` because it was honestly kind of useless
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less15
1 files changed, 8 insertions, 7 deletions
diff --git a/less/forms.less b/less/forms.less
index dacc4bb50..c7b376cda 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -22,7 +22,7 @@ legend {
padding: 0;
margin-bottom: @line-height-computed;
font-size: (@font-size-base * 1.5);
- line-height: @line-height-headings;
+ line-height: inherit;
color: @gray-dark;
border: 0;
border-bottom: 1px solid #e5e5e5;
@@ -56,7 +56,7 @@ input[type="tel"],
input[type="color"] {
display: block;
min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
- padding: 6px 9px;
+ padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
line-height: @line-height-base;
color: @gray;
@@ -241,13 +241,13 @@ input[type="search"],
input[type="tel"],
input[type="color"] {
&.input-large {
- padding: @padding-large;
+ padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
}
&.input-small {
min-height: @input-height-small;
- padding: @padding-small;
+ padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
@@ -397,11 +397,12 @@ select:focus:invalid {
border-radius: @border-radius-base;
&.input-small {
- padding: @padding-small;
+ padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
- border-radius: @border-radius-small; }
+ border-radius: @border-radius-small;
+ }
&.input-large {
- padding: @padding-large;
+ padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
}