From 7e2aa5516e852b37174a6f06a0ab30bbbcbb578f Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Thu, 16 Aug 2018 11:41:13 -0400
Subject: [PATCH] refactor(sass): change order of Sass imports to use global
 vars

This allows us to use the variables in ionic.theme.default without
having to import it. This new order is consistent with how the mode
specific globals already work.
---
 core/src/components/content/content.scss           | 2 +-
 core/src/components/item-sliding/item-sliding.scss | 2 +-
 core/src/components/list/list.scss                 | 1 -
 core/src/themes/ionic.globals.scss                 | 2 ++
 core/src/themes/ionic.theme.default.ios.scss       | 2 --
 core/src/themes/ionic.theme.default.md.scss        | 5 -----
 core/src/themes/ionic.theme.default.scss           | 2 --
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/core/src/components/content/content.scss b/core/src/components/content/content.scss
index 239f22e3b3..276dccda45 100644
--- a/core/src/components/content/content.scss
+++ b/core/src/components/content/content.scss
@@ -1,4 +1,4 @@
-@import "../../themes/ionic.theme.default";
+@import "../../themes/ionic.globals";
 
 // Content
 // --------------------------------------------------
diff --git a/core/src/components/item-sliding/item-sliding.scss b/core/src/components/item-sliding/item-sliding.scss
index 066d53fe7d..3505515e69 100644
--- a/core/src/components/item-sliding/item-sliding.scss
+++ b/core/src/components/item-sliding/item-sliding.scss
@@ -1,4 +1,4 @@
-@import "../../themes/ionic.theme.default";
+@import "../../themes/ionic.globals";
 
 // Item Sliding
 // --------------------------------------------------
diff --git a/core/src/components/list/list.scss b/core/src/components/list/list.scss
index 1ba9caa5f8..566c62f36e 100644
--- a/core/src/components/list/list.scss
+++ b/core/src/components/list/list.scss
@@ -1,5 +1,4 @@
 @import "../../themes/ionic.globals";
-@import "../../themes/ionic.theme.default";
 
 
 // List
diff --git a/core/src/themes/ionic.globals.scss b/core/src/themes/ionic.globals.scss
index d893bb0bf8..df9aa3c5ad 100644
--- a/core/src/themes/ionic.globals.scss
+++ b/core/src/themes/ionic.globals.scss
@@ -11,6 +11,8 @@
 // Global Mixins
 @import "./ionic.mixins";
 
+// Default Theme
+@import "./ionic.theme.default";
 
 // Global app direction
 $app-direction: ltr !default;
diff --git a/core/src/themes/ionic.theme.default.ios.scss b/core/src/themes/ionic.theme.default.ios.scss
index c0d6231c12..9fadfd604f 100644
--- a/core/src/themes/ionic.theme.default.ios.scss
+++ b/core/src/themes/ionic.theme.default.ios.scss
@@ -1,5 +1,3 @@
-@import "./ionic.theme.default";
-
 
 // iOS General Colors
 // --------------------------------------------------
diff --git a/core/src/themes/ionic.theme.default.md.scss b/core/src/themes/ionic.theme.default.md.scss
index 2986d6045f..c085e74b77 100644
--- a/core/src/themes/ionic.theme.default.md.scss
+++ b/core/src/themes/ionic.theme.default.md.scss
@@ -1,12 +1,7 @@
-@import "./ionic.theme.default";
 
 // Material Design Default Theme
 // ----------------------------------
 
-// Material Design General
-// --------------------------------------------------
-
-
 // Material Design General Colors
 // --------------------------------------------------
 $backdrop-md-color:                         $backdrop-color !default;
diff --git a/core/src/themes/ionic.theme.default.scss b/core/src/themes/ionic.theme.default.scss
index b2953dec9a..800c795692 100644
--- a/core/src/themes/ionic.theme.default.scss
+++ b/core/src/themes/ionic.theme.default.scss
@@ -1,5 +1,3 @@
-@import "./ionic.globals";
-
 // Default Foreground and Background Colors values
 // Allows users to override an foreground / background colors
 // TODO: @color-mod: remove all this