From 831ec87308fa8084ca221f1903e2e9abaf537a53 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 4 Dec 2015 21:34:27 -0600 Subject: [PATCH] import mode globals in all mode components --- ionic/components/action-sheet/action-sheet.scss | 2 +- ionic/components/action-sheet/modes/ios.scss | 2 +- ionic/components/action-sheet/modes/md.scss | 2 +- ionic/components/app/modes/ios.scss | 2 +- ionic/components/app/modes/md.scss | 2 +- ionic/components/app/structure.scss | 2 +- ionic/components/app/typography.scss | 2 +- ionic/components/badge/badge.scss | 2 +- ionic/components/button/button-clear.scss | 2 +- ionic/components/button/button-fab.scss | 2 +- ionic/components/button/button-icon.scss | 2 +- ionic/components/button/button-outline.scss | 2 +- ionic/components/button/button-size.scss | 2 +- ionic/components/button/button.scss | 2 +- ionic/components/button/button_OLD.scss | 2 +- ionic/components/button/modes/ios.scss | 2 +- ionic/components/button/modes/md.scss | 2 +- ionic/components/card/card.scss | 2 +- ionic/components/card/modes/ios.scss | 2 +- ionic/components/card/modes/md.scss | 2 +- ionic/components/checkbox/checkbox.scss | 2 +- ionic/components/checkbox/modes/ios.scss | 2 +- ionic/components/checkbox/modes/md.scss | 2 +- ionic/components/content/modes/ios.scss | 2 +- ionic/components/content/modes/md.scss | 2 +- ionic/components/grid/grid.scss | 2 +- ionic/components/icon/icon.scss | 2 +- ionic/components/item/item-media.scss | 2 +- ionic/components/item/item-sliding.scss | 2 +- ionic/components/item/item.scss | 2 +- ionic/components/item/modes/ios.scss | 2 +- ionic/components/item/modes/md.scss | 2 +- ionic/components/list/list.scss | 2 +- ionic/components/list/modes/ios.scss | 2 +- ionic/components/list/modes/md.scss | 2 +- ionic/components/menu/menu.scss | 2 +- ionic/components/menu/modes/ios.scss | 2 +- ionic/components/menu/modes/md.scss | 2 +- ionic/components/modal/modal.scss | 2 +- ionic/components/modal/modes/ios.scss | 2 +- ionic/components/modal/modes/md.scss | 2 +- ionic/components/popup/modes/ios.scss | 2 +- ionic/components/popup/modes/md.scss | 2 +- ionic/components/popup/popup.scss | 2 +- ionic/components/radio/modes/ios.scss | 2 +- ionic/components/radio/modes/md.scss | 2 +- ionic/components/radio/radio.scss | 2 +- ionic/components/scroll/scroll.scss | 2 +- ionic/components/searchbar/modes/ios.scss | 2 +- ionic/components/searchbar/modes/md.scss | 2 +- ionic/components/searchbar/searchbar.scss | 2 +- ionic/components/segment/modes/ios.scss | 2 +- ionic/components/segment/modes/md.scss | 2 +- ionic/components/segment/segment.scss | 2 +- ionic/components/slides/slides.scss | 2 +- ionic/components/switch/modes/ios.scss | 2 +- ionic/components/switch/modes/md.scss | 2 +- ionic/components/switch/switch.scss | 2 +- ionic/components/tabs/modes/ios.scss | 2 +- ionic/components/tabs/modes/md.scss | 2 +- ionic/components/tabs/tabs.scss | 2 +- ionic/components/tap-click/ripple.scss | 2 +- ionic/components/text-input/label.scss | 2 +- ionic/components/text-input/modes/ios.scss | 2 +- ionic/components/text-input/modes/md.scss | 2 +- ionic/components/text-input/text-input.scss | 2 +- ionic/components/toolbar/modes/ios.scss | 2 +- ionic/components/toolbar/modes/md.scss | 2 +- ionic/components/toolbar/toolbar.scss | 2 +- ionic/{ionic.globals.scss => globals.core.scss} | 0 ionic/globals.ios.scss | 7 +++++++ ionic/globals.md.scss | 7 +++++++ ionic/platform/cordova-ios.scss | 2 +- ionic/util/util.scss | 2 +- 74 files changed, 85 insertions(+), 71 deletions(-) rename ionic/{ionic.globals.scss => globals.core.scss} (100%) create mode 100644 ionic/globals.ios.scss create mode 100644 ionic/globals.md.scss diff --git a/ionic/components/action-sheet/action-sheet.scss b/ionic/components/action-sheet/action-sheet.scss index ad7ae28ce7..cadcf1bbc3 100644 --- a/ionic/components/action-sheet/action-sheet.scss +++ b/ionic/components/action-sheet/action-sheet.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Action Sheet // -------------------------------------------------- diff --git a/ionic/components/action-sheet/modes/ios.scss b/ionic/components/action-sheet/modes/ios.scss index d82136fd4c..a3cc41e673 100644 --- a/ionic/components/action-sheet/modes/ios.scss +++ b/ionic/components/action-sheet/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../action-sheet"; // iOS Action Sheet diff --git a/ionic/components/action-sheet/modes/md.scss b/ionic/components/action-sheet/modes/md.scss index d14e9d4e3b..127c4fea4c 100644 --- a/ionic/components/action-sheet/modes/md.scss +++ b/ionic/components/action-sheet/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../action-sheet"; // Material Design Action Sheet diff --git a/ionic/components/app/modes/ios.scss b/ionic/components/app/modes/ios.scss index 1b4d4174f3..40976c0d2a 100644 --- a/ionic/components/app/modes/ios.scss +++ b/ionic/components/app/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; // iOS App // -------------------------------------------------- diff --git a/ionic/components/app/modes/md.scss b/ionic/components/app/modes/md.scss index cd561d27e4..bc2b7e763b 100644 --- a/ionic/components/app/modes/md.scss +++ b/ionic/components/app/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; // Material Design App // -------------------------------------------------- diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index d42d3fdb67..f9354ac301 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Z-Index // -------------------------------------------------- diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss index 403f79e502..f38e936a98 100644 --- a/ionic/components/app/typography.scss +++ b/ionic/components/app/typography.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Typography // ------------------------- diff --git a/ionic/components/badge/badge.scss b/ionic/components/badge/badge.scss index af59078381..0af4a0c567 100644 --- a/ionic/components/badge/badge.scss +++ b/ionic/components/badge/badge.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Badge // -------------------------------------------------- diff --git a/ionic/components/button/button-clear.scss b/ionic/components/button/button-clear.scss index bacc71a346..205c3be62d 100644 --- a/ionic/components/button/button-clear.scss +++ b/ionic/components/button/button-clear.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Clear Button // -------------------------------------------------- diff --git a/ionic/components/button/button-fab.scss b/ionic/components/button/button-fab.scss index 26f0b03884..7494950782 100644 --- a/ionic/components/button/button-fab.scss +++ b/ionic/components/button/button-fab.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // FABulous Buttons (Floating Action Button from material) // -------------------------------------------------- diff --git a/ionic/components/button/button-icon.scss b/ionic/components/button/button-icon.scss index a29bd14fd3..31645d1f0d 100644 --- a/ionic/components/button/button-icon.scss +++ b/ionic/components/button/button-icon.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Button Icons // -------------------------------------------------- diff --git a/ionic/components/button/button-outline.scss b/ionic/components/button/button-outline.scss index 3ec1f0a476..1cd0f07822 100644 --- a/ionic/components/button/button-outline.scss +++ b/ionic/components/button/button-outline.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Outline Button // -------------------------------------------------- diff --git a/ionic/components/button/button-size.scss b/ionic/components/button/button-size.scss index 646d1f3c32..db45559bb3 100644 --- a/ionic/components/button/button-size.scss +++ b/ionic/components/button/button-size.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Button Sizes // -------------------------------------------------- diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss index c5cca7f981..03e460f1fa 100644 --- a/ionic/components/button/button.scss +++ b/ionic/components/button/button.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; $button-font-size: 1.6rem !default; $button-margin: 0.4rem 0.2rem !default; diff --git a/ionic/components/button/button_OLD.scss b/ionic/components/button/button_OLD.scss index e40c489e60..17ba64c9f5 100644 --- a/ionic/components/button/button_OLD.scss +++ b/ionic/components/button/button_OLD.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Button Variables // -------------------------------------------------- diff --git a/ionic/components/button/modes/ios.scss b/ionic/components/button/modes/ios.scss index ae3ee9ab77..03e7f03d6b 100644 --- a/ionic/components/button/modes/ios.scss +++ b/ionic/components/button/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../button"; @import "../button-clear"; @import "../button-fab"; diff --git a/ionic/components/button/modes/md.scss b/ionic/components/button/modes/md.scss index e4aa925807..b34f98b69f 100644 --- a/ionic/components/button/modes/md.scss +++ b/ionic/components/button/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../button"; @import "../button-clear"; @import "../button-fab"; diff --git a/ionic/components/card/card.scss b/ionic/components/card/card.scss index 9b7e726cfb..3b978ee45b 100644 --- a/ionic/components/card/card.scss +++ b/ionic/components/card/card.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Card // -------------------------------------------------- diff --git a/ionic/components/card/modes/ios.scss b/ionic/components/card/modes/ios.scss index 7e395a9a85..bc8f463cb2 100644 --- a/ionic/components/card/modes/ios.scss +++ b/ionic/components/card/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../card"; // iOS Card diff --git a/ionic/components/card/modes/md.scss b/ionic/components/card/modes/md.scss index 5b2c07324e..58a7c17886 100644 --- a/ionic/components/card/modes/md.scss +++ b/ionic/components/card/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../card"; // Material Design Card diff --git a/ionic/components/checkbox/checkbox.scss b/ionic/components/checkbox/checkbox.scss index 019ebc82b7..52d55bf78a 100644 --- a/ionic/components/checkbox/checkbox.scss +++ b/ionic/components/checkbox/checkbox.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Checkbox // -------------------------------------------------- diff --git a/ionic/components/checkbox/modes/ios.scss b/ionic/components/checkbox/modes/ios.scss index e02c675d24..39d265054b 100644 --- a/ionic/components/checkbox/modes/ios.scss +++ b/ionic/components/checkbox/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../checkbox"; // iOS Checkbox Structure diff --git a/ionic/components/checkbox/modes/md.scss b/ionic/components/checkbox/modes/md.scss index 5b2696e864..0c97f7e514 100644 --- a/ionic/components/checkbox/modes/md.scss +++ b/ionic/components/checkbox/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../checkbox"; // Material Design Checkbox diff --git a/ionic/components/content/modes/ios.scss b/ionic/components/content/modes/ios.scss index b09806ef91..198f032f27 100644 --- a/ionic/components/content/modes/ios.scss +++ b/ionic/components/content/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; // iOS Content // -------------------------------------------------- diff --git a/ionic/components/content/modes/md.scss b/ionic/components/content/modes/md.scss index 35f80f395f..c1ec178d3a 100644 --- a/ionic/components/content/modes/md.scss +++ b/ionic/components/content/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; // Material Design Content Padding // -------------------------------------------------- diff --git a/ionic/components/grid/grid.scss b/ionic/components/grid/grid.scss index d8e848beeb..7b85adff0d 100644 --- a/ionic/components/grid/grid.scss +++ b/ionic/components/grid/grid.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Grid // -------------------------------------------------- diff --git a/ionic/components/icon/icon.scss b/ionic/components/icon/icon.scss index 2532821cf6..516dcf5ff2 100644 --- a/ionic/components/icon/icon.scss +++ b/ionic/components/icon/icon.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Icon // -------------------------------------------------- diff --git a/ionic/components/item/item-media.scss b/ionic/components/item/item-media.scss index 70976886f0..c65f6aac5c 100644 --- a/ionic/components/item/item-media.scss +++ b/ionic/components/item/item-media.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Item Media // -------------------------------------------------- diff --git a/ionic/components/item/item-sliding.scss b/ionic/components/item/item-sliding.scss index 61a6c6d3fa..f6330677cd 100644 --- a/ionic/components/item/item-sliding.scss +++ b/ionic/components/item/item-sliding.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // The hidden right-side buttons that can be exposed under a list item with dragging. diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index f48f77ca7a..c8a75316b0 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Item // -------------------------------------------------- diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index c873d5924b..7e05a1e032 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../item"; // iOS Item diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index 2481c6df74..aff884fed2 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../item"; // Material Design Item diff --git a/ionic/components/list/list.scss b/ionic/components/list/list.scss index 53b922e553..b17a9af89f 100644 --- a/ionic/components/list/list.scss +++ b/ionic/components/list/list.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // List // -------------------------------------------------- diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss index 3b6fb4f8ab..56644ae858 100644 --- a/ionic/components/list/modes/ios.scss +++ b/ionic/components/list/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../list"; // iOS List diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss index 3b8155dc3e..7a6b761d87 100644 --- a/ionic/components/list/modes/md.scss +++ b/ionic/components/list/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../list"; // Material Design List diff --git a/ionic/components/menu/menu.scss b/ionic/components/menu/menu.scss index a5293db25a..9bf48a9441 100644 --- a/ionic/components/menu/menu.scss +++ b/ionic/components/menu/menu.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Menu // -------------------------------------------------- diff --git a/ionic/components/menu/modes/ios.scss b/ionic/components/menu/modes/ios.scss index 827aa58d14..d49a000483 100644 --- a/ionic/components/menu/modes/ios.scss +++ b/ionic/components/menu/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; // iOS Menu // -------------------------------------------------- diff --git a/ionic/components/menu/modes/md.scss b/ionic/components/menu/modes/md.scss index d6d9ec791d..cf1b68d53e 100644 --- a/ionic/components/menu/modes/md.scss +++ b/ionic/components/menu/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; // Material Design Menu // -------------------------------------------------- diff --git a/ionic/components/modal/modal.scss b/ionic/components/modal/modal.scss index 63e5ce6929..cdf777bce8 100644 --- a/ionic/components/modal/modal.scss +++ b/ionic/components/modal/modal.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Modals // -------------------------------------------------- diff --git a/ionic/components/modal/modes/ios.scss b/ionic/components/modal/modes/ios.scss index f92f7cef4c..45c341c13f 100644 --- a/ionic/components/modal/modes/ios.scss +++ b/ionic/components/modal/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; // iOS Modals // -------------------------------------------------- diff --git a/ionic/components/modal/modes/md.scss b/ionic/components/modal/modes/md.scss index b479f9fe36..fd099ec018 100644 --- a/ionic/components/modal/modes/md.scss +++ b/ionic/components/modal/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; // Material Design Modals // -------------------------------------------------- diff --git a/ionic/components/popup/modes/ios.scss b/ionic/components/popup/modes/ios.scss index 3a3fc47773..a1f7c298f0 100644 --- a/ionic/components/popup/modes/ios.scss +++ b/ionic/components/popup/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../popup"; // iOS Popups diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss index 73db6d7187..75e49bba86 100644 --- a/ionic/components/popup/modes/md.scss +++ b/ionic/components/popup/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../popup"; // Material Design Popups diff --git a/ionic/components/popup/popup.scss b/ionic/components/popup/popup.scss index e41d71095b..4429b65223 100644 --- a/ionic/components/popup/popup.scss +++ b/ionic/components/popup/popup.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Popups // -------------------------------------------------- diff --git a/ionic/components/radio/modes/ios.scss b/ionic/components/radio/modes/ios.scss index d13460e8ea..59518488a2 100644 --- a/ionic/components/radio/modes/ios.scss +++ b/ionic/components/radio/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../radio"; // iOS Radio diff --git a/ionic/components/radio/modes/md.scss b/ionic/components/radio/modes/md.scss index c6e301d2ff..dbe999d0dc 100644 --- a/ionic/components/radio/modes/md.scss +++ b/ionic/components/radio/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../radio"; // Material Design Radio diff --git a/ionic/components/radio/radio.scss b/ionic/components/radio/radio.scss index aa8578c546..6fcf12120d 100644 --- a/ionic/components/radio/radio.scss +++ b/ionic/components/radio/radio.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Radio // -------------------------------------------------- diff --git a/ionic/components/scroll/scroll.scss b/ionic/components/scroll/scroll.scss index fcfdc391b6..8b4557c491 100644 --- a/ionic/components/scroll/scroll.scss +++ b/ionic/components/scroll/scroll.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; ion-scroll { position: relative; diff --git a/ionic/components/searchbar/modes/ios.scss b/ionic/components/searchbar/modes/ios.scss index a9f3ec8467..acd600659d 100644 --- a/ionic/components/searchbar/modes/ios.scss +++ b/ionic/components/searchbar/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../searchbar"; // iOS Searchbar diff --git a/ionic/components/searchbar/modes/md.scss b/ionic/components/searchbar/modes/md.scss index 201d17706c..d90cc29c98 100644 --- a/ionic/components/searchbar/modes/md.scss +++ b/ionic/components/searchbar/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../searchbar"; // Material Design Searchbar diff --git a/ionic/components/searchbar/searchbar.scss b/ionic/components/searchbar/searchbar.scss index 9b70f89662..1da21d8d86 100644 --- a/ionic/components/searchbar/searchbar.scss +++ b/ionic/components/searchbar/searchbar.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Search Bar // -------------------------------------------------- diff --git a/ionic/components/segment/modes/ios.scss b/ionic/components/segment/modes/ios.scss index 333a04d118..e6beac0bde 100644 --- a/ionic/components/segment/modes/ios.scss +++ b/ionic/components/segment/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../segment"; // iOS Segment diff --git a/ionic/components/segment/modes/md.scss b/ionic/components/segment/modes/md.scss index f80c29dd53..6b3377c622 100644 --- a/ionic/components/segment/modes/md.scss +++ b/ionic/components/segment/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../segment"; // iOS Segment diff --git a/ionic/components/segment/segment.scss b/ionic/components/segment/segment.scss index 54bec89cef..821d6da4b6 100644 --- a/ionic/components/segment/segment.scss +++ b/ionic/components/segment/segment.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Segment // -------------------------------------------------- diff --git a/ionic/components/slides/slides.scss b/ionic/components/slides/slides.scss index eb91036869..a1987c8185 100644 --- a/ionic/components/slides/slides.scss +++ b/ionic/components/slides/slides.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; ion-swipe-slides { display: block; diff --git a/ionic/components/switch/modes/ios.scss b/ionic/components/switch/modes/ios.scss index 9c1005049b..901bf3dd52 100644 --- a/ionic/components/switch/modes/ios.scss +++ b/ionic/components/switch/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../switch"; // iOS Switch diff --git a/ionic/components/switch/modes/md.scss b/ionic/components/switch/modes/md.scss index 6689b22e4a..fb581e3006 100644 --- a/ionic/components/switch/modes/md.scss +++ b/ionic/components/switch/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../switch"; // Material Design Switch diff --git a/ionic/components/switch/switch.scss b/ionic/components/switch/switch.scss index ddb264eba6..1dcec2e97a 100644 --- a/ionic/components/switch/switch.scss +++ b/ionic/components/switch/switch.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Switch // -------------------------------------------------- diff --git a/ionic/components/tabs/modes/ios.scss b/ionic/components/tabs/modes/ios.scss index 1c08e2eeed..601a0517bd 100644 --- a/ionic/components/tabs/modes/ios.scss +++ b/ionic/components/tabs/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../tabs"; // iOS Tabs diff --git a/ionic/components/tabs/modes/md.scss b/ionic/components/tabs/modes/md.scss index 790b2e55e8..46f90e6156 100644 --- a/ionic/components/tabs/modes/md.scss +++ b/ionic/components/tabs/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../tabs"; // Material Design Tabs diff --git a/ionic/components/tabs/tabs.scss b/ionic/components/tabs/tabs.scss index 978263b012..ae26419ea9 100644 --- a/ionic/components/tabs/tabs.scss +++ b/ionic/components/tabs/tabs.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Tabs // -------------------------------------------------- diff --git a/ionic/components/tap-click/ripple.scss b/ionic/components/tap-click/ripple.scss index 4dd25c5c52..b058893ca6 100644 --- a/ionic/components/tap-click/ripple.scss +++ b/ionic/components/tap-click/ripple.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.md"; // Material Design Ripple Effect // -------------------------------------------------- diff --git a/ionic/components/text-input/label.scss b/ionic/components/text-input/label.scss index 5dfd1df34d..a1af3688b3 100644 --- a/ionic/components/text-input/label.scss +++ b/ionic/components/text-input/label.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Label // -------------------------------------------------- diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss index b6ef39cfe5..2b8ff5410a 100644 --- a/ionic/components/text-input/modes/ios.scss +++ b/ionic/components/text-input/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; @import "../label"; @import "../text-input"; diff --git a/ionic/components/text-input/modes/md.scss b/ionic/components/text-input/modes/md.scss index ee210862e1..e604bae33f 100644 --- a/ionic/components/text-input/modes/md.scss +++ b/ionic/components/text-input/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; @import "../label"; @import "../text-input"; diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss index d1bc7879b3..0b020aa81c 100644 --- a/ionic/components/text-input/text-input.scss +++ b/ionic/components/text-input/text-input.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Text Input // -------------------------------------------------- diff --git a/ionic/components/toolbar/modes/ios.scss b/ionic/components/toolbar/modes/ios.scss index 96b46ca775..e0e012acf7 100644 --- a/ionic/components/toolbar/modes/ios.scss +++ b/ionic/components/toolbar/modes/ios.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.ios"; // iOS Toolbar // -------------------------------------------------- diff --git a/ionic/components/toolbar/modes/md.scss b/ionic/components/toolbar/modes/md.scss index 418118debf..bef35e0c6b 100644 --- a/ionic/components/toolbar/modes/md.scss +++ b/ionic/components/toolbar/modes/md.scss @@ -1,4 +1,4 @@ -@import "../../../ionic.globals"; +@import "../../../globals.md"; // Material Design Toolbar // -------------------------------------------------- diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss index 6c090b272d..e53669f031 100644 --- a/ionic/components/toolbar/toolbar.scss +++ b/ionic/components/toolbar/toolbar.scss @@ -1,4 +1,4 @@ -@import "../../ionic.globals"; +@import "../../globals.core"; // Toolbar // -------------------------------------------------- diff --git a/ionic/ionic.globals.scss b/ionic/globals.core.scss similarity index 100% rename from ionic/ionic.globals.scss rename to ionic/globals.core.scss diff --git a/ionic/globals.ios.scss b/ionic/globals.ios.scss new file mode 100644 index 0000000000..2b4e2f6a4e --- /dev/null +++ b/ionic/globals.ios.scss @@ -0,0 +1,7 @@ + +// Global Core +@import "globals.core"; + + +// Global iOS +@import "themes/default.ios"; diff --git a/ionic/globals.md.scss b/ionic/globals.md.scss new file mode 100644 index 0000000000..9b16483290 --- /dev/null +++ b/ionic/globals.md.scss @@ -0,0 +1,7 @@ + +// Core Globals +@import "globals.core"; + + +// Material Design Globals +@import "themes/default.md"; diff --git a/ionic/platform/cordova-ios.scss b/ionic/platform/cordova-ios.scss index c7715e991a..25b7e84b1a 100644 --- a/ionic/platform/cordova-ios.scss +++ b/ionic/platform/cordova-ios.scss @@ -1,4 +1,4 @@ -@import "../ionic.globals"; +@import "../globals.core"; // iOS Cordova // -------------------------------------------------- diff --git a/ionic/util/util.scss b/ionic/util/util.scss index cd70584b19..70b65c4952 100755 --- a/ionic/util/util.scss +++ b/ionic/util/util.scss @@ -1,4 +1,4 @@ -@import "../ionic.globals"; +@import "../globals.core"; .align-left { text-align: left;