From fe5aa35db8f69ddbffac8c42c1f590e3d21e7aa0 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 30 Jul 2013 18:12:34 +0200 Subject: [PATCH] fixes bypassing converter (make it work for RC1) --- .../stylesheets/bootstrap/_carousel.scss | 2 +- .../assets/stylesheets/bootstrap/_close.scss | 2 +- .../assets/stylesheets/bootstrap/_forms.scss | 2 +- .../assets/stylesheets/bootstrap/_mixins.scss | 146 +++++++++--------- .../assets/stylesheets/bootstrap/_navbar.scss | 2 +- .../assets/stylesheets/bootstrap/_navs.scss | 4 +- .../stylesheets/bootstrap/_thumbnails.scss | 2 +- .../assets/stylesheets/bootstrap/_type.scss | 2 +- .../stylesheets/bootstrap/_variables.scss | 125 ++++++++------- 9 files changed, 142 insertions(+), 145 deletions(-) diff --git a/vendor/assets/stylesheets/bootstrap/_carousel.scss b/vendor/assets/stylesheets/bootstrap/_carousel.scss index 2b80622f..868b70de 100644 --- a/vendor/assets/stylesheets/bootstrap/_carousel.scss +++ b/vendor/assets/stylesheets/bootstrap/_carousel.scss @@ -21,7 +21,7 @@ // Account for jankitude on images > img, > a > img { - @include img-responsive(); + @extend .img-responsive; line-height: 1; } } diff --git a/vendor/assets/stylesheets/bootstrap/_close.scss b/vendor/assets/stylesheets/bootstrap/_close.scss index f930f7b7..2d929aff 100644 --- a/vendor/assets/stylesheets/bootstrap/_close.scss +++ b/vendor/assets/stylesheets/bootstrap/_close.scss @@ -23,7 +23,7 @@ // Additional properties for button version // iOS requires the button element instead of an anchor tag. // If you want the anchor version, it requires `href="#"`. - button& { + button & { padding: 0; cursor: pointer; background: transparent; diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss index b8ffb37a..ee5b14a4 100644 --- a/vendor/assets/stylesheets/bootstrap/_forms.scss +++ b/vendor/assets/stylesheets/bootstrap/_forms.scss @@ -147,7 +147,7 @@ input[type="number"] { } // Reset height for `textarea`s - textarea& { + textarea & { height: auto; } } diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index 45542810..cef8fb7b 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -221,7 +221,7 @@ opacity: $opacity; // IE8 filter $opacity-ie: ($opacity * 100); - filter: #{alpha(opacity=${opacity-ie})}; + filter: #{alpha(opacity=$opacity-ie)}; } @@ -229,77 +229,75 @@ // GRADIENTS // -------------------------------------------------- -#gradient { - // Horizontal gradient, from left to right - // - // Creates two color stops, start and end, by specifying a color and position for each color stop. - // Color stops are not available in IE9 and below. - @mixin horizontal($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { - background-color: $end-color; - background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+ - background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+ - background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10 - background-repeat: repeat-x; - filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb($start-color),argb($end-color); // IE9 and down - } +// Horizontal gradient, from left to right +// +// Creates two color stops, start and end, by specifying a color and position for each color stop. +// Color stops are not available in IE9 and below. +@mixin gradient-horizontal($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { + background-color: $end-color; + background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+ + background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+ + background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10 + background-repeat: repeat-x; + filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb($start-color),argb($end-color); // IE9 and down +} - // Vertical gradient, from top to bottom - // - // Creates two color stops, start and end, by specifying a color and position for each color stop. - // Color stops are not available in IE9 and below. - @mixin vertical($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { - background-color: $end-color; - background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+ - background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+ - background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10 - background-repeat: repeat-x; - filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb($start-color),argb($end-color); // IE9 and down - } +// Vertical gradient, from top to bottom +// +// Creates two color stops, start and end, by specifying a color and position for each color stop. +// Color stops are not available in IE9 and below. +@mixin gradient-vertical($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) { + background-color: $end-color; + background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+ + background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+ + background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10 + background-repeat: repeat-x; + filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb($start-color),argb($end-color); // IE9 and down +} - @mixin directional($start-color: #555, $end-color: #333, $deg: 45deg) { - background-color: $end-color; - background-repeat: repeat-x; - background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+ - background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+ - background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10 - } - @mixin horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { - background-color: mix($mid-color, $end-color, 80%); - background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); - background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); - background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); - background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); - background-repeat: no-repeat; - filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb($start-color),argb($end-color); // IE9 and down, gets no color-stop at all for proper fallback - } +@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) { + background-color: $end-color; + background-repeat: repeat-x; + background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+ + background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+ + background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10 +} +@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { + background-color: mix($mid-color, $end-color, 80%); + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); + background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); + background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); + background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); + background-repeat: no-repeat; + filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb($start-color),argb($end-color); // IE9 and down, gets no color-stop at all for proper fallback +} - @mixin vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { - background-color: mix($mid-color, $end-color, 80%); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); - background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); - background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color); - background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); - background-repeat: no-repeat; - filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb($start-color),argb($end-color); // IE9 and down, gets no color-stop at all for proper fallback - } - @mixin radial($inner-color: #555, $outer-color: #333) { - background-color: $outer-color; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color)); - background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color); - background-image: -moz-radial-gradient(circle, $inner-color, $outer-color); - background-image: radial-gradient(circle, $inner-color, $outer-color); - background-repeat: no-repeat; - } - @mixin striped($color: #555, $angle: 45deg) { - background-color: $color; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - } +@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { + background-color: mix($mid-color, $end-color, 80%); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); + background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); + background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color); + background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); + background-repeat: no-repeat; + filter: "progid:DXImageTransform.Microsoft@include gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb($start-color),argb($end-color); // IE9 and down, gets no color-stop at all for proper fallback +} +@mixin gradient-radial($inner-color: #555, $outer-color: #333) { + background-color: $outer-color; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color)); + background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color); + background-image: -moz-radial-gradient(circle, $inner-color, $outer-color); + background-image: radial-gradient(circle, $inner-color, $outer-color); + background-repeat: no-repeat; +} +@mixin gradient-striped($color: #555, $angle: 45deg) { + background-color: $color; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); } // Reset filters for IE @@ -425,16 +423,16 @@ // More easily include all the states for responsive-utilities.less. @mixin responsive-visibility() { display: block !important; - tr& { display: table-row !important; } - th&, - td& { display: table-cell !important; } + tr & { display: table-row !important; } + th &, + td & { display: table-cell !important; } } @mixin responsive-invisibility() { display: none !important; - tr& { display: none !important; } - th&, - td& { display: none !important; } + tr & { display: none !important; } + th &, + td & { display: none !important; } } // Grid System diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss index 33f90940..54b3adc4 100644 --- a/vendor/assets/stylesheets/bootstrap/_navbar.scss +++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss @@ -146,7 +146,7 @@ // Navbar form .navbar-form { - @include form-inline(); + @extend .form-inline; @include navbar-vertical-align($input-height-base); // Vertically center in navbar } diff --git a/vendor/assets/stylesheets/bootstrap/_navs.scss b/vendor/assets/stylesheets/bootstrap/_navs.scss index 2d0f675b..551d6b69 100644 --- a/vendor/assets/stylesheets/bootstrap/_navs.scss +++ b/vendor/assets/stylesheets/bootstrap/_navs.scss @@ -110,8 +110,8 @@ } // pulling this in mainly for less shorthand &.nav-justified { - @include nav-justified(); - @include nav-tabs-justified(); + @extend .nav-justified; + @extend .nav-tabs-justified; } } diff --git a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss index 7ce317d3..8e3bca35 100644 --- a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +++ b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss @@ -22,7 +22,7 @@ } .thumbnail > img, .img-thumbnail { - @include img-responsive(); + @extend .img-responsive; } // Add a hover state for linked versions only diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss index eed1877f..c6965a32 100644 --- a/vendor/assets/stylesheets/bootstrap/_type.scss +++ b/vendor/assets/stylesheets/bootstrap/_type.scss @@ -119,7 +119,7 @@ ol { } // Inline turns list items into inline-block .list-inline { - @include list-unstyled(); + @extend .list-unstyled; > li { display: inline-block; padding-left: 5px; diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index 2f512328..973e950e 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -175,69 +175,6 @@ $zindex-modal-background: 1040 !default; $zindex-modal: 1050 !default; -// Navbar -// ------------------------- - -// Basics of a navbar -$navbar-height: 50px !default; -$navbar-color: #777 !default; -$navbar-bg: #eee !default; -$navbar-padding-horizontal: floor($grid-gutter-width / 2) !default; // ~15px -$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default; - -// Navbar links -$navbar-link-color: #777 !default; -$navbar-link-hover-color: #333 !default; -$navbar-link-hover-bg: transparent !default; -$navbar-link-active-color: #555 !default; -$navbar-link-active-bg: darken($navbar-bg, 10%) !default; -$navbar-link-disabled-color: #ccc !default; -$navbar-link-disabled-bg: transparent !default; - -// Navbar brand label -$navbar-brand-color: $navbar-link-color !default; -$navbar-brand-hover-color: darken($navbar-link-color, 10%) !default; -$navbar-brand-hover-bg: transparent !default; - -// Navbar toggle -$navbar-toggle-hover-bg: #ddd !default; -$navbar-toggle-icon-bar-bg: #ccc !default; -$navbar-toggle-border-color: #ddd !default; - - -// Inverted navbar -// -// Reset inverted navbar basics -$navbar-inverse-color: $gray-light !default; -$navbar-inverse-bg: #222 !default; - -// Inverted navbar links -$navbar-inverse-link-color: $gray-light !default; -$navbar-inverse-link-hover-color: #fff !default; -$navbar-inverse-link-hover-bg: transparent !default; -$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default; -$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default; -$navbar-inverse-link-disabled-color: #444 !default; -$navbar-inverse-link-disabled-bg: transparent !default; - -// Inverted navbar brand label -$navbar-inverse-brand-color: $navbar-inverse-link-color !default; -$navbar-inverse-brand-hover-color: #fff !default; -$navbar-inverse-brand-hover-bg: transparent !default; - -// Inverted navbar search -// Normal navbar needs no special styles or vars -$navbar-inverse-search-bg: lighten($navbar-inverse-bg, 25%) !default; -$navbar-inverse-search-bg-focus: #fff !default; -$navbar-inverse-search-border: $navbar-inverse-bg !default; -$navbar-inverse-search-placeholder-color: #ccc !default; - -// Inverted navbar toggle -$navbar-inverse-toggle-hover-bg: #333 !default; -$navbar-inverse-toggle-icon-bar-bg: #fff !default; -$navbar-inverse-toggle-border-color: #333 !default; - - // Navs // ------------------------- @@ -566,3 +503,65 @@ $grid-columns: 12 !default; $grid-gutter-width: 30px !default; // Point at which the navbar stops collapsing $grid-float-breakpoint: $screen-tablet !default; + +// Navbar +// ------------------------- + +// Basics of a navbar +$navbar-height: 50px !default; +$navbar-color: #777 !default; +$navbar-bg: #eee !default; +$navbar-padding-horizontal: floor($grid-gutter-width / 2) !default; // ~15px +$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default; + +// Navbar links +$navbar-link-color: #777 !default; +$navbar-link-hover-color: #333 !default; +$navbar-link-hover-bg: transparent !default; +$navbar-link-active-color: #555 !default; +$navbar-link-active-bg: darken($navbar-bg, 10%) !default; +$navbar-link-disabled-color: #ccc !default; +$navbar-link-disabled-bg: transparent !default; + +// Navbar brand label +$navbar-brand-color: $navbar-link-color !default; +$navbar-brand-hover-color: darken($navbar-link-color, 10%) !default; +$navbar-brand-hover-bg: transparent !default; + +// Navbar toggle +$navbar-toggle-hover-bg: #ddd !default; +$navbar-toggle-icon-bar-bg: #ccc !default; +$navbar-toggle-border-color: #ddd !default; + + +// Inverted navbar +// +// Reset inverted navbar basics +$navbar-inverse-color: $gray-light !default; +$navbar-inverse-bg: #222 !default; + +// Inverted navbar links +$navbar-inverse-link-color: $gray-light !default; +$navbar-inverse-link-hover-color: #fff !default; +$navbar-inverse-link-hover-bg: transparent !default; +$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default; +$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default; +$navbar-inverse-link-disabled-color: #444 !default; +$navbar-inverse-link-disabled-bg: transparent !default; + +// Inverted navbar brand label +$navbar-inverse-brand-color: $navbar-inverse-link-color !default; +$navbar-inverse-brand-hover-color: #fff !default; +$navbar-inverse-brand-hover-bg: transparent !default; + +// Inverted navbar search +// Normal navbar needs no special styles or vars +$navbar-inverse-search-bg: lighten($navbar-inverse-bg, 25%) !default; +$navbar-inverse-search-bg-focus: #fff !default; +$navbar-inverse-search-border: $navbar-inverse-bg !default; +$navbar-inverse-search-placeholder-color: #ccc !default; + +// Inverted navbar toggle +$navbar-inverse-toggle-hover-bg: #333 !default; +$navbar-inverse-toggle-icon-bar-bg: #fff !default; +$navbar-inverse-toggle-border-color: #333 !default;