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.
This commit is contained in:
Brandy Carney
2018-08-16 11:41:13 -04:00
parent e5b30a67f5
commit 7e2aa5516e
7 changed files with 4 additions and 12 deletions

View File

@ -1,4 +1,4 @@
@import "../../themes/ionic.theme.default"; @import "../../themes/ionic.globals";
// Content // Content
// -------------------------------------------------- // --------------------------------------------------

View File

@ -1,4 +1,4 @@
@import "../../themes/ionic.theme.default"; @import "../../themes/ionic.globals";
// Item Sliding // Item Sliding
// -------------------------------------------------- // --------------------------------------------------

View File

@ -1,5 +1,4 @@
@import "../../themes/ionic.globals"; @import "../../themes/ionic.globals";
@import "../../themes/ionic.theme.default";
// List // List

View File

@ -11,6 +11,8 @@
// Global Mixins // Global Mixins
@import "./ionic.mixins"; @import "./ionic.mixins";
// Default Theme
@import "./ionic.theme.default";
// Global app direction // Global app direction
$app-direction: ltr !default; $app-direction: ltr !default;

View File

@ -1,5 +1,3 @@
@import "./ionic.theme.default";
// iOS General Colors // iOS General Colors
// -------------------------------------------------- // --------------------------------------------------

View File

@ -1,12 +1,7 @@
@import "./ionic.theme.default";
// Material Design Default Theme // Material Design Default Theme
// ---------------------------------- // ----------------------------------
// Material Design General
// --------------------------------------------------
// Material Design General Colors // Material Design General Colors
// -------------------------------------------------- // --------------------------------------------------
$backdrop-md-color: $backdrop-color !default; $backdrop-md-color: $backdrop-color !default;

View File

@ -1,5 +1,3 @@
@import "./ionic.globals";
// Default Foreground and Background Colors values // Default Foreground and Background Colors values
// Allows users to override an foreground / background colors // Allows users to override an foreground / background colors
// TODO: @color-mod: remove all this // TODO: @color-mod: remove all this