vendor/assets/stylesheets/bootstrap/_mixins.scss in bootstrap-sass-3.1.0.0 vs vendor/assets/stylesheets/bootstrap/_mixins.scss in bootstrap-sass-3.1.0.1

- old
+ new

@@ -152,14 +152,14 @@ @mixin rotate($degrees) { -webkit-transform: rotate($degrees); -ms-transform: rotate($degrees); // IE9 only transform: rotate($degrees); } -@mixin scale($ratio, $ratio-y...) { - -webkit-transform: scale($ratio, $ratio-y); - -ms-transform: scale($ratio, $ratio-y); // IE9 only - transform: scale($ratio, $ratio-y); +@mixin scale($scale-args...) { + -webkit-transform: scale($scale-args); + -ms-transform: scale($scale-args); // IE9 only + transform: scale($scale-args); } @mixin translate($x, $y) { -webkit-transform: translate($x, $y); -ms-transform: translate($x, $y); // IE9 only transform: translate($x, $y); @@ -588,21 +588,23 @@ } } // Contextual backgrounds // ------------------------- -@mixin bg-variant($color) { - background-color: $color; - a:hover { +// [converter] $parent hack +@mixin bg-variant($parent, $color) { + #{$parent} { background-color: $color; } + a#{$parent}:hover { background-color: darken($color, 10%); } } // Typography // ------------------------- -@mixin text-emphasis-variant($color) { - color: $color; - a:hover { +// [converter] $parent hack +@mixin text-emphasis-variant($parent, $color) { + #{$parent} { color: $color; } + a#{$parent}:hover { color: darken($color, 10%); } } // Navbar vertical align