From 10eea20feb97bf0d86118c202ac9923d4aff547e Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 23 Sep 2016 15:42:11 -0700
Subject: [PATCH] chore(theming): clean up prebuilts, add pink-bluegrey (#1315)

---
 .../theming/prebuilt/deeppurple-amber.scss    | 17 +++++------
 .../core/theming/prebuilt/indigo-pink.scss    | 29 +++++--------------
 .../core/theming/prebuilt/pink-bluegrey.scss  | 14 +++++++++
 .../core/theming/prebuilt/purple-green.scss   | 17 +++++------
 4 files changed, 35 insertions(+), 42 deletions(-)
 create mode 100644 src/lib/core/theming/prebuilt/pink-bluegrey.scss

diff --git a/src/lib/core/theming/prebuilt/deeppurple-amber.scss b/src/lib/core/theming/prebuilt/deeppurple-amber.scss
index ef5d2aa394b..76b1bda5972 100644
--- a/src/lib/core/theming/prebuilt/deeppurple-amber.scss
+++ b/src/lib/core/theming/prebuilt/deeppurple-amber.scss
@@ -1,17 +1,14 @@
-@import '../theming';
 @import '../all-theme';
-@import '../palette';
-@import '../../core';
 
 
-$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();
 
-// Include all theme-styles for the components based on the current theme.
+// Define a theme.
+$primary: md-palette($md-deep-purple);
+$accent:  md-palette($md-amber, A200, A100, A400);
+
+$theme: md-light-theme($primary, $accent);
+
+// Include all theme styles for the components.
 @include angular-material-theme($theme);
diff --git a/src/lib/core/theming/prebuilt/indigo-pink.scss b/src/lib/core/theming/prebuilt/indigo-pink.scss
index a7b9c1d9498..c30601d71da 100644
--- a/src/lib/core/theming/prebuilt/indigo-pink.scss
+++ b/src/lib/core/theming/prebuilt/indigo-pink.scss
@@ -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.
+// Define a theme.
+$primary: md-palette($md-indigo);
+$accent:  md-palette($md-pink, A200, A100, A400);
+
+$theme: md-light-theme($primary, $accent);
+
+// Include all theme styles for the components.
 @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);
-
-  // Include all theme-styles for the components based on the current theme.
-  @include angular-material-theme($dark-theme);
-}
-
diff --git a/src/lib/core/theming/prebuilt/pink-bluegrey.scss b/src/lib/core/theming/prebuilt/pink-bluegrey.scss
new file mode 100644
index 00000000000..d93cbc9e748
--- /dev/null
+++ b/src/lib/core/theming/prebuilt/pink-bluegrey.scss
@@ -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);
diff --git a/src/lib/core/theming/prebuilt/purple-green.scss b/src/lib/core/theming/prebuilt/purple-green.scss
index b994144f6eb..d3239be83be 100644
--- a/src/lib/core/theming/prebuilt/purple-green.scss
+++ b/src/lib/core/theming/prebuilt/purple-green.scss
@@ -1,17 +1,14 @@
-@import '../theming';
 @import '../all-theme';
-@import '../palette';
-@import '../../core';
 
 
-$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();
 
-// Include all theme-styles for the components based on the current theme.
+// Define a theme.
+$primary: md-palette($md-purple, 700, 500, 800);
+$accent:  md-palette($md-green, A200, A100, A400);
+
+$theme: md-dark-theme($primary, $accent);
+
+// Include all theme styles for the components.
 @include angular-material-theme($theme);