import mode globals in all mode components

2025-08-19 03:32:21 +08:00 · 2015-12-04 21:34:27 -06:00
parent 5d3e9a4f99
commit 831ec87308
74 changed files with 85 additions and 71 deletions
--- 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
 // --------------------------------------------------
--- 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
--- 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
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- a/ionic/components/app/structure.scss
+++ b/ionic/components/app/structure.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Z-Index
 // --------------------------------------------------
--- a/ionic/components/app/typography.scss
+++ b/ionic/components/app/typography.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Typography
 // -------------------------
--- a/ionic/components/badge/badge.scss
+++ b/ionic/components/badge/badge.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Badge
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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)
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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;
--- 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
 // --------------------------------------------------
--- 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";
--- 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";
--- a/ionic/components/card/card.scss
+++ b/ionic/components/card/card.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Card
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/checkbox/checkbox.scss
+++ b/ionic/components/checkbox/checkbox.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Checkbox
 // --------------------------------------------------
--- 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
--- 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
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- a/ionic/components/grid/grid.scss
+++ b/ionic/components/grid/grid.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Grid
 // --------------------------------------------------
--- a/ionic/components/icon/icon.scss
+++ b/ionic/components/icon/icon.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Icon
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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.
--- a/ionic/components/item/item.scss
+++ b/ionic/components/item/item.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Item
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/list/list.scss
+++ b/ionic/components/list/list.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // List
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/menu/menu.scss
+++ b/ionic/components/menu/menu.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Menu
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- a/ionic/components/modal/modal.scss
+++ b/ionic/components/modal/modal.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Modals
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/popup/popup.scss
+++ b/ionic/components/popup/popup.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Popups
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/radio/radio.scss
+++ b/ionic/components/radio/radio.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Radio
 // --------------------------------------------------
--- 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;
--- 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
--- 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
--- a/ionic/components/searchbar/searchbar.scss
+++ b/ionic/components/searchbar/searchbar.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Search Bar
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/segment/segment.scss
+++ b/ionic/components/segment/segment.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Segment
 // --------------------------------------------------
--- 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;
--- 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
--- 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
--- a/ionic/components/switch/switch.scss
+++ b/ionic/components/switch/switch.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Switch
 // --------------------------------------------------
--- 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
--- 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
--- a/ionic/components/tabs/tabs.scss
+++ b/ionic/components/tabs/tabs.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Tabs
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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";

--- 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";

--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- 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
 // --------------------------------------------------
--- a/ionic/components/toolbar/toolbar.scss
+++ b/ionic/components/toolbar/toolbar.scss
@ -1,4 +1,4 @@
-@import "../../ionic.globals";
+@import "../../globals.core";

 // Toolbar
 // --------------------------------------------------
--- a/ionic/ionic.globals.scss
+++ b/ionic/ionic.globals.scss
--- a/ionic/globals.ios.scss
+++ b/ionic/globals.ios.scss
@ -0,0 +1,7 @@
+
+// Global Core
+@import "globals.core";
+
+
+// Global iOS
+@import "themes/default.ios";
--- a/ionic/globals.md.scss
+++ b/ionic/globals.md.scss
@ -0,0 +1,7 @@
+
+// Core Globals
+@import "globals.core";
+
+
+// Material Design Globals
+@import "themes/default.md";
--- a/ionic/platform/cordova-ios.scss
+++ b/ionic/platform/cordova-ios.scss
@ -1,4 +1,4 @@
-@import "../ionic.globals";
+@import "../globals.core";

 // iOS Cordova
 // --------------------------------------------------
--- 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;