Commit a09cea44 authored by Mark Otto's avatar Mark Otto
Browse files

more vars changed

parent 01421ecd
21 merge requests!7033Fix backdrop undefined bug in modal,!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7329Fix for issue #7328,!7219Fix for mini typo mistake in css.html,!7674Clear float on all when navbar is collapsed - v3,!7344Fixed .spanX selector (*= instead of ^=),!7346Fix compilation error,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7509Proposed fix for allowing Collapse events ('show'/'hide') to be cancelled,!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,!6853typeahead: do not store item data in an attribute,!6666Patch 1,!65463.0.0 wip - fixed the issue in which the test pid isn't killed if a test fails,!6503control markup changes added
Showing with 28 additions and 30 deletions
+28 -30
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
<input type="text" class="span3" placeholder="#ddd"> <input type="text" class="span3" placeholder="#ddd">
<h3>{{_i}}Forms{{/i}}</h3> <h3>{{_i}}Forms{{/i}}</h3>
<label>@placeholderText</label> <label>@input-color-placeholder</label>
<input type="text" class="span3" placeholder="@grayLight"> <input type="text" class="span3" placeholder="@grayLight">
<label>@input-background</label> <label>@input-background</label>
<input type="text" class="span3" placeholder="#fff"> <input type="text" class="span3" placeholder="#fff">
......
...@@ -663,13 +663,13 @@ legend + .control-group { ...@@ -663,13 +663,13 @@ legend + .control-group {
// Float the labels left // Float the labels left
.control-label { .control-label {
float: left; float: left;
width: @horizontalComponentOffset - 20; width: @component-offset-horizontal - 20;
padding-top: 5px; padding-top: 5px;
text-align: right; text-align: right;
} }
// Move over all input controls and content // Move over all input controls and content
.controls { .controls {
margin-left: @horizontalComponentOffset; margin-left: @component-offset-horizontal;
} }
// Remove bottom margin on block level help text since that's accounted for on .control-group // Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block { .help-block {
...@@ -688,6 +688,6 @@ legend + .control-group { ...@@ -688,6 +688,6 @@ legend + .control-group {
} }
// Move over buttons in .form-actions to align with .controls // Move over buttons in .form-actions to align with .controls
.form-actions { .form-actions {
padding-left: @horizontalComponentOffset; padding-left: @component-offset-horizontal;
} }
} }
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
// Placeholder text // Placeholder text
// ------------------------- // -------------------------
.placeholder(@color: @placeholderText) { .placeholder(@color: @input-color-placeholder) {
&:-moz-placeholder { &:-moz-placeholder {
color: @color; color: @color;
} }
......
...@@ -140,13 +140,13 @@ dd { ...@@ -140,13 +140,13 @@ dd {
.clearfix(); // Ensure dl clears floats if empty dd elements present .clearfix(); // Ensure dl clears floats if empty dd elements present
dt { dt {
float: left; float: left;
width: @horizontalComponentOffset - 20; width: @component-offset-horizontal - 20;
clear: left; clear: left;
text-align: right; text-align: right;
.text-overflow(); .text-overflow();
} }
dd { dd {
margin-left: @horizontalComponentOffset; margin-left: @component-offset-horizontal;
} }
} }
...@@ -157,7 +157,7 @@ dd { ...@@ -157,7 +157,7 @@ dd {
hr { hr {
margin: @line-height-base 0; margin: @line-height-base 0;
border: 0; border: 0;
border-top: 1px solid @hrBorder; border-top: 1px solid @hr-border;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
......
...@@ -108,10 +108,12 @@ ...@@ -108,10 +108,12 @@
@input-border-radius: @border-radius-base; @input-border-radius: @border-radius-base;
@input-border-radius-search: 20px; @input-border-radius-search: 20px;
@form-actions-background: #f5f5f5; @input-color-placeholder: @grayLight;
@input-height: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border @input-height: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border
@form-actions-background: #f5f5f5;
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
...@@ -138,6 +140,7 @@ ...@@ -138,6 +140,7 @@
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :) // Try to avoid customizing these :)
@zindex-dropdown: 1000; @zindex-dropdown: 1000;
@zindex-popover: 1010; @zindex-popover: 1010;
@zindex-tooltip: 1030; @zindex-tooltip: 1030;
...@@ -145,28 +148,10 @@ ...@@ -145,28 +148,10 @@
@zindex-modal-background: 1040; @zindex-modal-background: 1040;
@zindex-modal: 1050; @zindex-modal: 1050;
// Input placeholder text color
// -------------------------
@placeholderText: @grayLight;
// Hr border color
// -------------------------
@hrBorder: @grayLighter;
// Horizontal forms & lists
// -------------------------
@horizontalComponentOffset: 180px;
// Wells
// -------------------------
@wellBackground: #f5f5f5;
// Navbar // Navbar
// ------------------------- // -------------------------
@navbarCollapseWidth: 979px; @navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; @navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
...@@ -254,6 +239,19 @@ ...@@ -254,6 +239,19 @@
@popoverArrowOuterColor: rgba(0,0,0,.25); @popoverArrowOuterColor: rgba(0,0,0,.25);
// Miscellaneous
// -------------------------
// Hr border color
@hr-border: @grayLighter;
// Horizontal forms & lists
@component-offset-horizontal: 180px;
// Wells
@well-background: #f5f5f5;
// GRID // GRID
// -------------------------------------------------- // --------------------------------------------------
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
min-height: 20px; min-height: 20px;
padding: 19px; padding: 19px;
margin-bottom: 20px; margin-bottom: 20px;
background-color: @wellBackground; background-color: @well-background;
border: 1px solid darken(@wellBackground, 7%); border: 1px solid darken(@well-background, 7%);
border-radius: @border-radius-base; border-radius: @border-radius-base;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
blockquote { blockquote {
......
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