From 5398ae9f54d2e3f31cc3ac44722ccdf98062df76 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 30 Jul 2013 18:02:33 +0200 Subject: [PATCH] converter: fix multiparameter mixin definitions --- tasks/converter.rb | 4 +++- vendor/assets/stylesheets/bootstrap/_mixins.scss | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tasks/converter.rb b/tasks/converter.rb index 5057a803..2c281143 100644 --- a/tasks/converter.rb +++ b/tasks/converter.rb @@ -147,7 +147,9 @@ private end def replace_mixin_file(less) - less.gsub(/^(\s*)\.([\w-]+\(.*\))(\s*{)/, '\1@mixin \2\3') + less.gsub(/^(\s*)\.([\w-]+\(.*\))(\s*\{)/) { |match| + "#{$1}@mixin #{$2.tr(';', ',')}#{$3}" + } end def replace_vars(less) diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index 0772f8ff..45542810 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -235,7 +235,7 @@ // // 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%) { + @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+ @@ -249,7 +249,7 @@ // // 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%) { + @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+