fix: fix the repeated generated css theme classes if there is multipl…

…e themes defined (#1784)
vuematerial · Jul 12, 2018 · 2922afa · 2922afa
1 parent 4bed8cc
commit 2922afa
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/theme/all.scss b/src/theme/all.scss
@@ -1,3 +1,4 @@
+$md-theme-name: 'all';
 @import "../components/MdApp/theme";
 @import "../components/MdAutocomplete/theme";
 @import "../components/MdAvatar/theme";

diff --git a/src/theme/mixins.scss b/src/theme/mixins.scss
@@ -52,6 +52,7 @@
   }
 
   $md-themes: $theme !global;
+  $md-theme-name: $name !global;
 
   @include md-base-theme;
 }
@@ -88,8 +89,10 @@
     $md-theme-palette: map-merge($md-theme-palette, $palette) !global;
     $md-current-theme: $theme !global;
 
-    &.md-theme-#{$theme} {
-      @content;
+    @if( $theme == $md-theme-name or $md-theme-name == 'all' ) {
+      &.md-theme-#{$theme} {
+        @content;
+      }
     }
   }
 }
@@ -112,8 +115,10 @@
     $md-theme-palette: map-merge($md-theme-palette, $palette) !global;
     $md-current-theme: $theme !global;
 
-    .md-theme-#{$theme} & {
-      @content;
+    @if( $theme == $md-theme-name or $md-theme-name == 'all' ) {
+      .md-theme-#{$theme} & {
+        @content;
+      }
     }
   }
 }

diff --git a/src/theme/variables.scss b/src/theme/variables.scss
@@ -50,6 +50,17 @@ $md-themes: ();
 $md-current-theme: null;
 
 
+/**
+ * Store the newly registered theme name for comparison, used for checking just called md-register-theme's theme name
+ * ---
+ * @access private
+ * @type string
+ * @group themes
+ */
+
+$md-theme-name: null;
+
+
 /**
  * The color contrast values
  * ---