aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-03-31 17:33:55 -0700
committerMark Otto <[email protected]>2013-03-31 17:33:55 -0700
commit896ee794731f1159bfab247b12914caa1eb21850 (patch)
treeef50625a80f66328e3edfa1504a8eca14276f047 /less
parent8b9d488377ab9ef10544e53620e0f082d310684e (diff)
downloadbootstrap-896ee794731f1159bfab247b12914caa1eb21850.tar.xz
bootstrap-896ee794731f1159bfab247b12914caa1eb21850.zip
more consistent forms vars; drop search border radius since no more search form
Diffstat (limited to 'less')
-rw-r--r--less/forms.less6
-rw-r--r--less/variables.less10
2 files changed, 6 insertions, 10 deletions
diff --git a/less/forms.less b/less/forms.less
index 0c440265d..4235eff9c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -62,7 +62,7 @@ input[type="color"] {
line-height: @line-height-base;
color: @gray;
vertical-align: middle;
- background-color: @input-background;
+ background-color: @input-bg;
border: 1px solid @input-border;
border-radius: @input-border-radius;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -286,7 +286,7 @@ textarea {
&[readonly],
fieldset[disabled] & {
cursor: not-allowed;
- background-color: @input-background-disabled;
+ background-color: @input-bg-disabled;
}
}
// Explicitly reset the colors here
@@ -341,7 +341,7 @@ select:focus:invalid {
padding: (@line-height-base - 1) 20px @line-height-base;
margin-top: @line-height-base;
margin-bottom: @line-height-base;
- background-color: @form-actions-background;
+ background-color: @form-actions-bg;
border-top: 1px solid #e5e5e5;
.clearfix(); // Adding clearfix to allow for .pull-right button containers
}
diff --git a/less/variables.less b/less/variables.less
index 31522165c..bf51a7d33 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -108,12 +108,11 @@
// Forms
// -------------------------
-@input-background: #fff;
-@input-background-disabled: @grayLighter;
+@input-bg: #fff;
+@input-bg-disabled: @grayLighter;
@input-border: #ccc;
@input-border-radius: @border-radius-base;
-@input-border-radius-search: 20px;
@input-color-placeholder: @grayLight;
@@ -121,10 +120,7 @@
@input-height-large: (@line-height-base + 24px); // base line-height + 22px vertical padding + 2px top/bottom border
@input-height-small: (@line-height-base + 6px); // base line-height + 4px vertical padding + 2px top/bottom border
-// adjust min-height on input sizes
-
-
-@form-actions-background: #f5f5f5;
+@form-actions-bg: #f5f5f5;
// Dropdowns