Skip to content

Commit

Permalink
chore(theming): clean up prebuilts, add pink-bluegrey (#1315)
Browse files Browse the repository at this point in the history
  • Loading branch information
jelbourn authored and kara committed Sep 23, 2016
1 parent 3e8b9d9 commit 10eea20
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 39 deletions.
15 changes: 6 additions & 9 deletions src/lib/core/theming/prebuilt/deeppurple-amber.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
@import '../theming';
@import '../all-theme';
@import '../palette';
@import '../../core';


// Include non-theme styles for core.
@include md-core();

// Define a theme.
$primary: md-palette($md-deep-purple);
$accent: md-palette($md-amber, A200, A100, A400);
$warn: md-palette($md-red);

$theme: md-light-theme($primary, $accent, $warn);

// Include non-theme styles for core.
@include md-core();
$theme: md-light-theme($primary, $accent);

// Include all theme-styles for the components based on the current theme.
// Include all theme styles for the components.
@include angular-material-theme($theme);
27 changes: 6 additions & 21 deletions src/lib/core/theming/prebuilt/indigo-pink.scss
Original file line number Diff line number Diff line change
@@ -1,29 +1,14 @@
@import '../theming';
@import '../all-theme';
@import '../palette';
@import '../../core';


$primary: md-palette($md-indigo);
$accent: md-palette($md-pink, A200, A100, A400);
$warn: md-palette($md-red);

$theme: md-light-theme($primary, $accent, $warn);

// Include non-theme styles for core.
@include md-core();

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

.my-app-dark-theme {
$dark-primary: md-palette($md-blue-grey);
$dark-accent: md-palette($md-amber, A200, A100, A400);
$dark-warn: md-palette($md-deep-orange);

$dark-theme: md-dark-theme($dark-primary, $dark-accent, $dark-warn);
// Define a theme.
$primary: md-palette($md-indigo);
$accent: md-palette($md-pink, A200, A100, A400);

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

// Include all theme styles for the components.
@include angular-material-theme($theme);
14 changes: 14 additions & 0 deletions src/lib/core/theming/prebuilt/pink-bluegrey.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@import '../all-theme';


// Include non-theme styles for core.
@include md-core();

// Define a theme.
$primary: md-palette($md-pink, 700, 500, 900);
$accent: md-palette($md-blue-grey, A200, A100, A400);

$theme: md-dark-theme($primary, $accent);

// Include all theme styles for the components.
@include angular-material-theme($theme);
15 changes: 6 additions & 9 deletions src/lib/core/theming/prebuilt/purple-green.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
@import '../theming';
@import '../all-theme';
@import '../palette';
@import '../../core';


// Include non-theme styles for core.
@include md-core();

// Define a theme.
$primary: md-palette($md-purple, 700, 500, 800);
$accent: md-palette($md-green, A200, A100, A400);
$warn: md-palette($md-red);

$theme: md-dark-theme($primary, $accent, $warn);

// Include non-theme styles for core.
@include md-core();
$theme: md-dark-theme($primary, $accent);

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

0 comments on commit 10eea20

Please sign in to comment.