Commit 896ee794 authored by Mark Otto's avatar Mark Otto
Browse files

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

parent 8b9d4883
11 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7674Clear float on all when navbar is collapsed - v3,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch,!7865Patch 2,!7651Drop the sizzle dependency to allow smaller builds targeting mobile devices
Showing with 6 additions and 10 deletions
+6 -10
......@@ -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
}
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment