vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss in bootstrap-sass-rails-2.2.2.1 vs vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss in bootstrap-sass-rails-2.3.0.0

- old
+ new

@@ -22,13 +22,10 @@ } &:after { clear: both; } } -.clearfix { - @include clearfix(); -} // Webkit-style focus // ------------------ @mixin tab-focus() { // Default @@ -266,10 +263,16 @@ -webkit-transition-delay: $transition-delay; -moz-transition-delay: $transition-delay; -o-transition-delay: $transition-delay; transition-delay: $transition-delay; } +@mixin transition-duration($transition-duration) { + -webkit-transition-duration: $transition-duration; + -moz-transition-duration: $transition-duration; + -o-transition-duration: $transition-duration; + transition-duration: $transition-duration; +} // Transformations @mixin rotate($degrees) { -webkit-transform: rotate($degrees); -moz-transform: rotate($degrees); @@ -431,10 +434,20 @@ background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+ background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10 background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10 } +@mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { + background-color: mix($midColor, $endColor, 80%); + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); + background-image: -webkit-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); + background-image: -moz-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); + background-image: -o-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); + background-image: linear-gradient(to right, $startColor, $midColor $colorStop, $endColor); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($startColor)}, endColorstr=#{ie-hex-str($endColor)}, GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback +} @mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { background-color: mix($midColor, $endColor, 80%); background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor); background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor); @@ -493,10 +506,10 @@ @include gradientBar($startColor, $endColor, $textColor, $textShadow); *background-color: $endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ @include reset-filter(); // in these cases the gradient won't cover the background, so we override - &:hover, &:active, &.active, &.disabled, &[disabled] { + &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] { color: $textColor; background-color: $endColor; *background-color: darken($endColor, 5%); }