make +scale(one_argument) compatible with Sass list handling. See #518

Author: glebm

lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.1.0.0'
-  BOOTSTRAP_SHA = '362708acdd1f75bf5ccbcd98dfbb5e005297921b'
+  BOOTSTRAP_SHA = '9c054fd4c0db89cbbb1df3c868bafc4f2c17c3e3'
 end

tasks/converter/less_conversion.rb

@@ -75,6 +75,11 @@ def process_stylesheet_assets
             file = replace_rules(file, '  .list-group-item-') { |rule| extract_nested_rule rule, 'a&' }
             file = replace_all file, /,\s*\.open \.dropdown-toggle& \{(.*?)\}/m,
                                " {\\1}\n  .open & { &.dropdown-toggle {\\1} }"
+
+            # make +scale(one_argument) compatible with Sass list handling
+            # see https://github.com/twbs/bootstrap-sass/issues/518
+            file = replace_all file, '$ratio, $ratio-y', '$scale-args'
+
             file = convert_grid_mixins file
           when 'responsive-utilities.less'
             file = apply_mixin_parent_selector(file, '&\.(visible|hidden)')

vendor/assets/stylesheets/bootstrap/_mixins.scss

@@ -154,10 +154,10 @@
       -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);