diff options
author | Thomas McDonald <tom@conceptcoding.co.uk> | 2012-06-04 14:30:38 +0400 |
---|---|---|
committer | Thomas McDonald <tom@conceptcoding.co.uk> | 2012-06-04 14:30:38 +0400 |
commit | a2c99397c46bd013f73591045b30df3584ed9b2f (patch) | |
tree | 80697f34fe532f9d66ae6174d4d3b5a325686cba | |
parent | f0035b8cb721d8652d4d998258f68df0613d5dbc (diff) |
updated main CSS to 2.0.4
8 files changed, 106 insertions, 98 deletions
diff --git a/vendor/assets/stylesheets/bootstrap/_component-animations.scss b/vendor/assets/stylesheets/bootstrap/_component-animations.scss index 772efe6..ac5588e 100644 --- a/vendor/assets/stylesheets/bootstrap/_component-animations.scss +++ b/vendor/assets/stylesheets/bootstrap/_component-animations.scss @@ -2,10 +2,10 @@ // -------------------- .fade { - @include opacity(0); + opacity: 0; @include transition(opacity .15s linear); &.in { - @include opacity(1); + opacity: 1; } } diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss index 6b62f91..a63d5a1 100644 --- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss @@ -68,7 +68,7 @@ // Dividers (basically an hr) within the dropdown .divider { - @include nav-divider(); + @include nav-divider($dropdownDividerTop, $dropdownDividerBottom); } // Links within the dropdown menu @@ -98,14 +98,14 @@ // make the menu appear below buttons that appeared later on the page *z-index: $zindexDropdown; - .dropdown-menu { + & > .dropdown-menu { display: block; } } // Right aligned dropdowns // --------------------------- -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss index d72bc42..951b3de 100644 --- a/vendor/assets/stylesheets/bootstrap/_forms.scss +++ b/vendor/assets/stylesheets/bootstrap/_forms.scss @@ -27,7 +27,7 @@ legend { line-height: $baseLineHeight * 2; color: $grayDark; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; // Small small { @@ -48,63 +48,67 @@ input, button, select, textarea { label { display: block; margin-bottom: 5px; - color: $grayDark; } -// Inputs, Textareas, Selects -input, textarea, select, .uneditable-input { +// Form controls +// ------------------------- + +// Shared size and type resets +select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], +input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], +input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { display: inline-block; - width: 210px; height: $baseLineHeight; padding: 4px; margin-bottom: 9px; font-size: $baseFontSize; line-height: $baseLineHeight; color: $gray; - background-color: $inputBackground; - border: 1px solid $inputBorder; - @include border-radius($inputBorderRadius); } -.uneditable-textarea { - width: auto; + +// Reset appearance properties for textual inputs and textarea +// Declare width for legacy (can't be on input[type=*] selectors or it's too specific) +input, textarea { + width: 210px; +} +// Reset height since textareas have rows +textarea { height: auto; } +// Everything else +textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], +input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], +input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { + background-color: $inputBackground; + border: 1px solid $inputBorder; + @include border-radius($inputBorderRadius); + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); + @include transition(#{border linear .2s, box-shadow linear .2s}); -// Inputs within a label -label input, label textarea, label select { - display: block; + // Focus state + &:focus { + border-color: rgba(82,168,236,.8); + outline: 0; + outline: thin dotted \9; /* IE6-9 */ + @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)}); + } } -// Mini reset for unique input types -input[type="image"], input[type="checkbox"], input[type="radio"] { - width: auto; - height: auto; - padding: 0; +// Position radios and checkboxes better +input[type="radio"], input[type="checkbox"] { margin: 3px 0; *margin-top: 0; /* IE7 */ line-height: normal; cursor: pointer; - background-color: transparent; - border: 0 \9; /* IE9 and down */ - @include border-radius(0); -} -input[type="image"] { - border: 0; } -// Reset the file input to browser defaults -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: $inputBackground; - background-color: initial; - border: initial; - @include box-shadow(none); +// Reset width of input buttons, radios, checkboxes +input[type="submit"], input[type="reset"], input[type="button"], input[type="radio"], input[type="checkbox"] { + width: auto; // Override of generic input selector } -// Help out input buttons -input[type="button"], input[type="reset"], input[type="submit"] { +// Make uneditable textareas behave like a textarea +.uneditable-textarea { width: auto; height: auto; } @@ -116,15 +120,10 @@ select, input[type="file"] { line-height: 28px; } -// Reset line-height for IE -input[type="file"] { - line-height: 18px \9; -} - -// Chrome on Linux and Mobile Safari need background-color +// Make select elements obey height by applying a border select { width: 220px; // default input width + 10px of padding that doesn't get applied - background-color: $inputBackground; + border: 1px solid #bbb; } // Make multiple select elements height not fixed @@ -132,19 +131,9 @@ select[multiple], select[size] { height: auto; } -// Remove shadow from image inputs -input[type="image"] { - @include box-shadow(none); -} - -// Make textarea height behave -textarea { - height: auto; -} - -// Hidden inputs -input[type="hidden"] { - display: none; +// Focus for select, file, radio, and checkbox +select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { + @include tab-focus(); } @@ -181,26 +170,6 @@ input[type="hidden"] { -// FOCUS STATE -// ----------- - -input, textarea { - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - @include transition(#{border linear .2s, box-shadow linear .2s}); -} -input:focus, textarea:focus { - border-color: rgba(82,168,236,.8); - outline: 0; - outline: thin dotted \9; /* IE6-9 */ - @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)}); -} -input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus, select:focus { - @include tab-focus(); - @include box-shadow(none); // override for file inputs -} - - - // INPUT SIZES // ----------- @@ -219,6 +188,11 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditabl float: none; margin-left: 0; } +// Ensure input-prepend/append never wraps +.input-append input[class*="span"], .input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] { + display: inline-block; +} @@ -229,7 +203,6 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditabl - // DISABLED STATE // -------------- @@ -284,7 +257,7 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ margin-top: $baseLineHeight; margin-bottom: $baseLineHeight; background-color: $formActionsBackground; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; @include clearfix(); // Adding clearfix to allow for .pull-right button containers } @@ -299,7 +272,8 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ } // Placeholder text gets special styles; can't be bundled together though for some reason -@include placeholder($grayLight); +// (sass-edit) - need special mixin +@include rootPlaceholder(); @@ -449,7 +423,8 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ vertical-align: middle; } // Remove float and margin, set to inline-block -.form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"], .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { +.form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { float: left; margin-right: 3px; margin-left: 0; diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index 2385a54..54ecd6c 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -82,9 +82,25 @@ // Placeholder text // ------------------------- @mixin placeholder($color: $placeholderText) { + &:-moz-placeholder { + color: $color; + } + &:-ms-input-placeholder { + color: $color; + } + &::-webkit-input-placeholder { + color: $color; + } +} + +// Sass doesn't support using & at base level, so we need a special root placeholder mixin. +@mixin rootPlaceholder($color: $placeholderText) { :-moz-placeholder { color: $color; } + :-ms-input-placeholder { + color: $color; + } ::-webkit-input-placeholder { color: $color; } @@ -159,7 +175,7 @@ color: $textColor; } // Style inputs accordingly - input, select, textarea { + .checkbox, .radio, input, select, textarea { color: $textColor; border-color: $borderColor; &:focus { @@ -303,6 +319,17 @@ column-gap: $columnGap; } + +// Optional hyphenation +@mixin hyphens($mode: auto) { + word-wrap: break-word; + -webkit-hyphens: $mode; + -moz-hyphens: $mode; + -ms-hyphens: $mode; + -o-hyphens: $mode; + hyphens: $mode; +} + // Opacity @mixin opacity($opacity: 1) { opacity: $opacity; @@ -403,7 +430,7 @@ // Horizontal dividers // ------------------- // Dividers (basically an hr) within dropdowns and nav lists -@mixin nav-divider() { +@mixin nav-divider($top: #e5e5e5, $bottom: $white) { // IE7 needs a set width since we gave a height. Restricting just // to IE7 to keep the 1px left/right space in other browsers. // It is unclear where IE is getting the extra space that we need @@ -413,8 +440,8 @@ margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px *margin: -5px 0 5px; overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid $white; + background-color: $top; + border-bottom: 1px solid $bottom; } // Button backgrounds diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss index 279155a..ae95e8d 100644 --- a/vendor/assets/stylesheets/bootstrap/_navbar.scss +++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss @@ -115,13 +115,14 @@ @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)}); @include transition(none); + @include placeholder($navbarSearchPlaceholderColor); // Placeholder text gets special styles; can't be a grouped selector - &:-moz-placeholder { - color: $navbarSearchPlaceholderColor; - } - &::-webkit-input-placeholder { - color: $navbarSearchPlaceholderColor; - } +// &:-moz-placeholder { +// color: $navbarSearchPlaceholderColor; +// } +// &::-webkit-input-placeholder { +// color: $navbarSearchPlaceholderColor; +// } // Focus states (we use .focused since IE7-8 and down doesn't support :focus) &:focus, &.focused { diff --git a/vendor/assets/stylesheets/bootstrap/_reset.scss b/vendor/assets/stylesheets/bootstrap/_reset.scss index 1d9a62b..e687268 100644 --- a/vendor/assets/stylesheets/bootstrap/_reset.scss +++ b/vendor/assets/stylesheets/bootstrap/_reset.scss @@ -68,6 +68,11 @@ img { -ms-interpolation-mode: bicubic; } +// Prevent max-width from affecting Google Maps +#map_canvas img { + max-width: none; +} + // Forms // ------------------------- diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss index 76ac40c..8bebb84 100644 --- a/vendor/assets/stylesheets/bootstrap/_type.scss +++ b/vendor/assets/stylesheets/bootstrap/_type.scss @@ -8,9 +8,6 @@ p { margin: 0 0 $baseLineHeight / 2; - font-family: $baseFontFamily; - font-size: $baseFontSize; - line-height: $baseLineHeight; small { font-size: $baseFontSize - 2; color: $grayLight; @@ -166,7 +163,7 @@ em { // Abbreviations and acronyms abbr[title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted $grayLight; } abbr.initialism { diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index c68ba18..b1dc27d 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -103,6 +103,9 @@ $dropdownLinkColor: $grayDark !default; $dropdownLinkColorHover: $white !default; $dropdownLinkBackgroundHover: $linkColor !default; +$dropdownDividerTop: #e5e5e5 !default; +$dropdownDividerBottom: $white !default; + // COMPONENT VARIABLES // -------------------------------------------------- |