rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

more consistent forms vars; drop search border radius since no more search form

Browse Source
This commit is contained in:
Mark Otto 2013-03-31 17:33:55 -07:00
parent 8b9d488377
commit 896ee79473
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
less/forms.less
View File

@ -62,7 +62,7 @@ input[type="color"] {
line-height: @line-height-base; line-height: @line-height-base;
color: @gray; color: @gray;
vertical-align: middle; vertical-align: middle;
background-color: @input-background; background-color: @input-bg;
border: 1px solid @input-border; border: 1px solid @input-border;
border-radius: @input-border-radius; border-radius: @input-border-radius;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@ -286,7 +286,7 @@ textarea {
&[readonly], &[readonly],
fieldset[disabled] & { fieldset[disabled] & {
cursor: not-allowed; cursor: not-allowed;
background-color: @input-background-disabled; background-color: @input-bg-disabled;
} }
} }
// Explicitly reset the colors here // Explicitly reset the colors here
@ -341,7 +341,7 @@ select:focus:invalid {
padding: (@line-height-base - 1) 20px @line-height-base; padding: (@line-height-base - 1) 20px @line-height-base;
margin-top: @line-height-base; margin-top: @line-height-base;
margin-bottom: @line-height-base; margin-bottom: @line-height-base;
background-color: @form-actions-background; background-color: @form-actions-bg;
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
.clearfix(); // Adding clearfix to allow for .pull-right button containers .clearfix(); // Adding clearfix to allow for .pull-right button containers
} }

10
less/variables.less
View File

@ -108,12 +108,11 @@
// Forms // Forms
// ------------------------- // -------------------------
@input-background: #fff; @input-bg: #fff;
@input-background-disabled: @grayLighter; @input-bg-disabled: @grayLighter;
@input-border: #ccc; @input-border: #ccc;
@input-border-radius: @border-radius-base; @input-border-radius: @border-radius-base;
@input-border-radius-search: 20px;
@input-color-placeholder: @grayLight; @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-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 @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-bg: #f5f5f5;
@form-actions-background: #f5f5f5;
// Dropdowns // Dropdowns