Skip to content

Commit 2922afa

Browse files
simongccSamuell1
authored andcommitted
fix: fix the repeated generated css theme classes if there is multiple themes defined (#1784)
1 parent 4bed8cc commit 2922afa

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

src/theme/all.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
$md-theme-name: 'all';
12
@import "../components/MdApp/theme";
23
@import "../components/MdAutocomplete/theme";
34
@import "../components/MdAvatar/theme";

src/theme/mixins.scss

+9-4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
}
5353

5454
$md-themes: $theme !global;
55+
$md-theme-name: $name !global;
5556

5657
@include md-base-theme;
5758
}
@@ -88,8 +89,10 @@
8889
$md-theme-palette: map-merge($md-theme-palette, $palette) !global;
8990
$md-current-theme: $theme !global;
9091

91-
&.md-theme-#{$theme} {
92-
@content;
92+
@if( $theme == $md-theme-name or $md-theme-name == 'all' ) {
93+
&.md-theme-#{$theme} {
94+
@content;
95+
}
9396
}
9497
}
9598
}
@@ -112,8 +115,10 @@
112115
$md-theme-palette: map-merge($md-theme-palette, $palette) !global;
113116
$md-current-theme: $theme !global;
114117

115-
.md-theme-#{$theme} & {
116-
@content;
118+
@if( $theme == $md-theme-name or $md-theme-name == 'all' ) {
119+
.md-theme-#{$theme} & {
120+
@content;
121+
}
117122
}
118123
}
119124
}

src/theme/variables.scss

+11
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,17 @@ $md-themes: ();
5050
$md-current-theme: null;
5151

5252

53+
/**
54+
* Store the newly registered theme name for comparison, used for checking just called md-register-theme's theme name
55+
* ---
56+
* @access private
57+
* @type string
58+
* @group themes
59+
*/
60+
61+
$md-theme-name: null;
62+
63+
5364
/**
5465
* The color contrast values
5566
* ---

0 commit comments

Comments
 (0)