From 709a4ffbf934d4b245feaef75704370121a408e7 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Tue, 8 Dec 2015 15:48:04 -0600
Subject: [PATCH] sass conversion fixes for 0.5.4

---
 Gruntfile.js       | 15 +++++++--------
 sass/_buttons.scss |  2 +-
 sass/_mixins.scss  |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 462ec4d0..32ab0d05 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -151,9 +151,9 @@ module.exports = function (grunt) {
             },
 
             // button variations mixin replacement(s)
-            { // Multi-line replacement - https://regex101.com/r/qD9qB8/2
-              pattern: /.generic-variations\(unquote\(("[^"]+")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+?(?!\r|\n)contrast[\s\S]+?(?!\r|\n)(\d+)[\s\S]+?(?!\r|\n)}\);$\n/mg,
-              replacement: "@include button-variations(unquote($1), $2, $3%);\n",
+            { // https://regex101.com/r/qD9qB8/4
+              pattern: /.generic-variations\(unquote\(".btn", ~("([^"]+)?")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+}\);$\n/mg,
+              replacement: "@include button-variations(unquote(\".btn\"), $1, $3);\n",
               order: 20
             },
 
@@ -207,9 +207,9 @@ module.exports = function (grunt) {
             },
 
             // alert generic-variations (convert this one last - very broad search)
-            { // Multi-line replacement - https://regex101.com/r/jB1uL1/2
-              pattern: /.generic-variations\(unquote\(("([^"]+)?")\), unquote\(("([^"]+)?")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+}\);$\n/mg,
-              replacement: "@include alert-variations(unquote($1), unquote($3), $5);\n",
+            { // Multi-line replacement - https://regex101.com/r/jB1uL1/3
+              pattern: /.generic-variations\(unquote\(".alert"\), unquote\(("([^"]+)?")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+}\);$\n/mg,
+              replacement: "@include alert-variations(unquote(\".alert\"), unquote($1), $3);\n",
               order: 250 // very broad search, do this last
             },
 
@@ -218,8 +218,7 @@ module.exports = function (grunt) {
               pattern: /([\s\S]+)/mg,
               replacement: "\/\/ This file has been autogenerated by grunt task lessToSass. Any changes will be overwritten.\n\n$1",
               order: 1000 // very broad search, do this last
-            },
-
+            }
           ]
         }
       }
diff --git a/sass/_buttons.scss b/sass/_buttons.scss
index e8566b76..a5f0efa2 100644
--- a/sass/_buttons.scss
+++ b/sass/_buttons.scss
@@ -80,7 +80,7 @@
 
         // FIXME: SPEC - this should be the 600 color, how can we get that programmatically if at all? Or are we limited to the color palette only?
         // SASS conversion note: please mirror any content change in _mixins-shared.scss button-variations-content
-        @include alert-variations(unquote(".btn"), unquote(""), $mdb-btn-background-color);
+        @include button-variations(unquote(".btn"), "", $mdb-btn-background-color);
 
         // Spec:
         //  - Raised Light/Light theme no hover.
diff --git a/sass/_mixins.scss b/sass/_mixins.scss
index dec878c4..2cc2d0c7 100644
--- a/sass/_mixins.scss
+++ b/sass/_mixins.scss
@@ -42,8 +42,8 @@
 //  color: map-get($args, variation-color);
 //}
 
-@mixin button-variations($component, $selector-suffix, $color-default, $mdb-param-1) {
-  @include generic-variations($component, $selector-suffix, $color-default, "button-variations-content", $mdb-param-1);
+@mixin button-variations($component, $selector-suffix, $color-default) {
+  @include generic-variations($component, $selector-suffix, $color-default, "button-variations-content", 4%);
 }
 
 @mixin button-variations-content($args) {