From 89ed4e4b7be4c1b55cc0513e87fd7b614e106e27 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Mon, 2 Nov 2015 19:17:00 -0600
Subject: [PATCH] fix shadow extensions

---
 Gruntfile.js         | 17 ++++++++++++++++-
 sass/_buttons.scss   |  6 +++---
 sass/_cards.scss     |  2 +-
 sass/_dialogs.scss   |  2 +-
 sass/_popups.scss    |  2 +-
 sass/_welljumbo.scss |  2 +-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 621a0de2..039ea0d2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,22 @@ module.exports = function(grunt) {
           src: ['*.less', '!_mixins.less', '!_mixins-fullpalette.less'],
           ext: '.scss',
           dest: 'sass'
-        }]
+        }],
+        options: {
+          replacements: [
+            { // bad conversions to @include instead of @extend
+            pattern: /@include shadow-z-(\d+)\(\);/gi,
+            replacement: '@extend .shadow-z-$1;',
+            order: 2
+            },
+            { // bad conversions to @include instead of @extend
+              pattern: /@include (foo1|foo2)\(\);/gi,
+              replacement: '@extend .$1;',
+              order: 2
+            }
+
+          ]
+        }
       }
     },
 
diff --git a/sass/_buttons.scss b/sass/_buttons.scss
index 1ae88f9c..4093dc0b 100644
--- a/sass/_buttons.scss
+++ b/sass/_buttons.scss
@@ -10,7 +10,7 @@
   color: $darkbg-text;
 
   &:hover:not(.btn-link):not(.btn-flat):not(.btn-fab) {
-    @include shadow-z-1();
+    @extend .shadow-z-1;
   }
   &:active:not(.btn-link):not(.btn-flat):not(.btn-fab) {
     @include shadow-z-1-hover();
@@ -75,7 +75,7 @@
       @include variations(unquote(""), background-color, transparent);
     }
     &, &:hover {
-      @include shadow-z-1();
+      @extend .shadow-z-1;
     }
     &:active {
       @include shadow-z-1-hover();
@@ -137,7 +137,7 @@
 }
 
 @mixin btn-shadow(){
-  @include shadow-z-1();
+  @extend .shadow-z-1;
   transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
   &:active:not(.btn-link) {
     @include shadow-z-1-hover();
diff --git a/sass/_cards.scss b/sass/_cards.scss
index 53556083..c51eaa58 100644
--- a/sass/_cards.scss
+++ b/sass/_cards.scss
@@ -23,7 +23,7 @@
     color: $card-body-text;
     background: $card-body-background;
 
-    @include shadow-z-2();
+    @extend .shadow-z-2;
 
     .card-image {
         height: 60%;
diff --git a/sass/_dialogs.scss b/sass/_dialogs.scss
index 2cb75f38..3753122c 100644
--- a/sass/_dialogs.scss
+++ b/sass/_dialogs.scss
@@ -3,7 +3,7 @@
 // Material Design element Dialogs
 // --------------------------------------------------
 .modal-content {
-  @include shadow-z-5();
+  @extend .shadow-z-5;
   border-radius: 2px;
   border: none;
   // Modal header
diff --git a/sass/_popups.scss b/sass/_popups.scss
index 508e493d..3de6fa6d 100644
--- a/sass/_popups.scss
+++ b/sass/_popups.scss
@@ -4,7 +4,7 @@
   background: $popover-background;
   border: none;
   border-radius: $material-border-radius;
-  @include shadow-z-1();
+  @extend .shadow-z-1;
 }
 
 .tooltip, .tooltip.in {
diff --git a/sass/_welljumbo.scss b/sass/_welljumbo.scss
index dffa7965..6aff7f38 100644
--- a/sass/_welljumbo.scss
+++ b/sass/_welljumbo.scss
@@ -11,7 +11,7 @@ body, .container, .container-fluid {
     background-color: #fff;
     padding: 19px;
     margin-bottom: 20px;
-    @include shadow-z-2();
+    @extend .shadow-z-2;
     border-radius: 2px;
     border: 0;
     p {