Skip to content

Commit 10eea20

Browse files
jelbournkara
authored andcommitted
chore(theming): clean up prebuilts, add pink-bluegrey (#1315)
1 parent 3e8b9d9 commit 10eea20

File tree

4 files changed

+32
-39
lines changed

4 files changed

+32
-39
lines changed
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
@import '../theming';
21
@import '../all-theme';
3-
@import '../palette';
4-
@import '../../core';
52

63

4+
// Include non-theme styles for core.
5+
@include md-core();
6+
7+
// Define a theme.
78
$primary: md-palette($md-deep-purple);
89
$accent: md-palette($md-amber, A200, A100, A400);
9-
$warn: md-palette($md-red);
1010

11-
$theme: md-light-theme($primary, $accent, $warn);
12-
13-
// Include non-theme styles for core.
14-
@include md-core();
11+
$theme: md-light-theme($primary, $accent);
1512

16-
// Include all theme-styles for the components based on the current theme.
13+
// Include all theme styles for the components.
1714
@include angular-material-theme($theme);
Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
1-
@import '../theming';
21
@import '../all-theme';
3-
@import '../palette';
4-
@import '../../core';
52

63

7-
$primary: md-palette($md-indigo);
8-
$accent: md-palette($md-pink, A200, A100, A400);
9-
$warn: md-palette($md-red);
10-
11-
$theme: md-light-theme($primary, $accent, $warn);
12-
134
// Include non-theme styles for core.
145
@include md-core();
156

16-
// Include all theme-styles for the components based on the current theme.
17-
@include angular-material-theme($theme);
18-
19-
.my-app-dark-theme {
20-
$dark-primary: md-palette($md-blue-grey);
21-
$dark-accent: md-palette($md-amber, A200, A100, A400);
22-
$dark-warn: md-palette($md-deep-orange);
23-
24-
$dark-theme: md-dark-theme($dark-primary, $dark-accent, $dark-warn);
7+
// Define a theme.
8+
$primary: md-palette($md-indigo);
9+
$accent: md-palette($md-pink, A200, A100, A400);
2510

26-
// Include all theme-styles for the components based on the current theme.
27-
@include angular-material-theme($dark-theme);
28-
}
11+
$theme: md-light-theme($primary, $accent);
2912

13+
// Include all theme styles for the components.
14+
@include angular-material-theme($theme);
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@import '../all-theme';
2+
3+
4+
// Include non-theme styles for core.
5+
@include md-core();
6+
7+
// Define a theme.
8+
$primary: md-palette($md-pink, 700, 500, 900);
9+
$accent: md-palette($md-blue-grey, A200, A100, A400);
10+
11+
$theme: md-dark-theme($primary, $accent);
12+
13+
// Include all theme styles for the components.
14+
@include angular-material-theme($theme);
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
@import '../theming';
21
@import '../all-theme';
3-
@import '../palette';
4-
@import '../../core';
52

63

4+
// Include non-theme styles for core.
5+
@include md-core();
6+
7+
// Define a theme.
78
$primary: md-palette($md-purple, 700, 500, 800);
89
$accent: md-palette($md-green, A200, A100, A400);
9-
$warn: md-palette($md-red);
1010

11-
$theme: md-dark-theme($primary, $accent, $warn);
12-
13-
// Include non-theme styles for core.
14-
@include md-core();
11+
$theme: md-dark-theme($primary, $accent);
1512

16-
// Include all theme-styles for the components based on the current theme.
13+
// Include all theme styles for the components.
1714
@include angular-material-theme($theme);

0 commit comments

Comments
 (0)