diff --git a/core/src/components/accordion-group/accordion-group.scss b/core/src/components/accordion-group/accordion-group.scss index 172e48a347..4c78af5e36 100644 --- a/core/src/components/accordion-group/accordion-group.scss +++ b/core/src/components/accordion-group/accordion-group.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "../accordion/accordion.vars"; // Accordion Group diff --git a/core/src/components/accordion/accordion.md.vars.scss b/core/src/components/accordion/accordion.md.vars.scss index 1a6ffd64a5..1efb5ee815 100644 --- a/core/src/components/accordion/accordion.md.vars.scss +++ b/core/src/components/accordion/accordion.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Accordion // -------------------------------------------------- diff --git a/core/src/components/accordion/accordion.vars.scss b/core/src/components/accordion/accordion.vars.scss index 2899324be1..6856e9eda2 100644 --- a/core/src/components/accordion/accordion.vars.scss +++ b/core/src/components/accordion/accordion.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Accordion // -------------------------------------------------- diff --git a/core/src/components/action-sheet/action-sheet.ios.vars.scss b/core/src/components/action-sheet/action-sheet.ios.vars.scss index 7aa19b4404..f0410e3f81 100644 --- a/core/src/components/action-sheet/action-sheet.ios.vars.scss +++ b/core/src/components/action-sheet/action-sheet.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Action Sheet // -------------------------------------------------- diff --git a/core/src/components/action-sheet/action-sheet.md.vars.scss b/core/src/components/action-sheet/action-sheet.md.vars.scss index c7d945090d..76700ffb13 100644 --- a/core/src/components/action-sheet/action-sheet.md.vars.scss +++ b/core/src/components/action-sheet/action-sheet.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Action Sheet // -------------------------------------------------- diff --git a/core/src/components/action-sheet/action-sheet.vars.scss b/core/src/components/action-sheet/action-sheet.vars.scss index 11cb6a28bf..98cc9e15fc 100644 --- a/core/src/components/action-sheet/action-sheet.vars.scss +++ b/core/src/components/action-sheet/action-sheet.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Action Sheet // -------------------------------------------------- diff --git a/core/src/components/alert/alert.ios.vars.scss b/core/src/components/alert/alert.ios.vars.scss index b3ddac35a8..434223dc2c 100644 --- a/core/src/components/alert/alert.ios.vars.scss +++ b/core/src/components/alert/alert.ios.vars.scss @@ -1,5 +1,5 @@ @use "sass:math"; -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Alert diff --git a/core/src/components/alert/alert.md.vars.scss b/core/src/components/alert/alert.md.vars.scss index 86965476ff..4ca163f7c7 100644 --- a/core/src/components/alert/alert.md.vars.scss +++ b/core/src/components/alert/alert.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Alert diff --git a/core/src/components/alert/alert.vars.scss b/core/src/components/alert/alert.vars.scss index c37269f65c..a19c3102b5 100644 --- a/core/src/components/alert/alert.vars.scss +++ b/core/src/components/alert/alert.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Alert // -------------------------------------------------- diff --git a/core/src/components/avatar/avatar.ios.vars.scss b/core/src/components/avatar/avatar.ios.vars.scss index 4a8a931c7b..c8db65bcd4 100644 --- a/core/src/components/avatar/avatar.ios.vars.scss +++ b/core/src/components/avatar/avatar.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Avatar diff --git a/core/src/components/avatar/avatar.md.vars.scss b/core/src/components/avatar/avatar.md.vars.scss index f397e61c4b..cd028971f4 100644 --- a/core/src/components/avatar/avatar.md.vars.scss +++ b/core/src/components/avatar/avatar.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Avatar diff --git a/core/src/components/avatar/avatar.scss b/core/src/components/avatar/avatar.scss index ef0413c5ba..6ffa10f3c8 100644 --- a/core/src/components/avatar/avatar.scss +++ b/core/src/components/avatar/avatar.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Avatar diff --git a/core/src/components/back-button/back-button.ios.vars.scss b/core/src/components/back-button/back-button.ios.vars.scss index 8793d741f2..58af53bbb6 100644 --- a/core/src/components/back-button/back-button.ios.vars.scss +++ b/core/src/components/back-button/back-button.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Back Button // -------------------------------------------------- diff --git a/core/src/components/back-button/back-button.md.vars.scss b/core/src/components/back-button/back-button.md.vars.scss index c7ce25cbb9..b73d3796c3 100644 --- a/core/src/components/back-button/back-button.md.vars.scss +++ b/core/src/components/back-button/back-button.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Back Button // -------------------------------------------------- diff --git a/core/src/components/back-button/back-button.scss b/core/src/components/back-button/back-button.scss index 9876135285..7a32a536c3 100644 --- a/core/src/components/back-button/back-button.scss +++ b/core/src/components/back-button/back-button.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Back Button // -------------------------------------------------- diff --git a/core/src/components/backdrop/backdrop.ios.vars.scss b/core/src/components/backdrop/backdrop.ios.vars.scss index c9a4083192..59ba8d1f0e 100644 --- a/core/src/components/backdrop/backdrop.ios.vars.scss +++ b/core/src/components/backdrop/backdrop.ios.vars.scss @@ -1 +1 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; diff --git a/core/src/components/backdrop/backdrop.md.vars.scss b/core/src/components/backdrop/backdrop.md.vars.scss index 74f1acdc02..438e8f84e3 100644 --- a/core/src/components/backdrop/backdrop.md.vars.scss +++ b/core/src/components/backdrop/backdrop.md.vars.scss @@ -1 +1 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; diff --git a/core/src/components/backdrop/backdrop.vars.scss b/core/src/components/backdrop/backdrop.vars.scss index e21c162d17..0f0f2aee56 100644 --- a/core/src/components/backdrop/backdrop.vars.scss +++ b/core/src/components/backdrop/backdrop.vars.scss @@ -1 +1 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; diff --git a/core/src/components/badge/badge.ios.vars.scss b/core/src/components/badge/badge.ios.vars.scss index 73dc0be8f7..8723a96e0a 100644 --- a/core/src/components/badge/badge.ios.vars.scss +++ b/core/src/components/badge/badge.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.md.vars.scss b/core/src/components/badge/badge.md.vars.scss index 90516314ec..06ca5c8d2a 100644 --- a/core/src/components/badge/badge.md.vars.scss +++ b/core/src/components/badge/badge.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.vars.scss b/core/src/components/badge/badge.vars.scss index ebaa3490a5..439066b106 100644 --- a/core/src/components/badge/badge.vars.scss +++ b/core/src/components/badge/badge.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Badge // -------------------------------------------------- diff --git a/core/src/components/breadcrumb/breadcrumb.ios.vars.scss b/core/src/components/breadcrumb/breadcrumb.ios.vars.scss index 97a91a74cc..cd427c101b 100644 --- a/core/src/components/breadcrumb/breadcrumb.ios.vars.scss +++ b/core/src/components/breadcrumb/breadcrumb.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Breadcrumb // -------------------------------------------------- diff --git a/core/src/components/breadcrumb/breadcrumb.md.vars.scss b/core/src/components/breadcrumb/breadcrumb.md.vars.scss index d638047353..897e5ec64a 100644 --- a/core/src/components/breadcrumb/breadcrumb.md.vars.scss +++ b/core/src/components/breadcrumb/breadcrumb.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Breadcrumb // -------------------------------------------------- diff --git a/core/src/components/breadcrumb/breadcrumb.vars.scss b/core/src/components/breadcrumb/breadcrumb.vars.scss index 43129a30d9..8630459c7d 100644 --- a/core/src/components/breadcrumb/breadcrumb.vars.scss +++ b/core/src/components/breadcrumb/breadcrumb.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Breadcrumb // -------------------------------------------------- diff --git a/core/src/components/breadcrumbs/breadcrumbs.vars.scss b/core/src/components/breadcrumbs/breadcrumbs.vars.scss index 4c3f84ffca..8beb212d0d 100644 --- a/core/src/components/breadcrumbs/breadcrumbs.vars.scss +++ b/core/src/components/breadcrumbs/breadcrumbs.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Breadcrumbs // -------------------------------------------------- diff --git a/core/src/components/button/button.ionic.vars.scss b/core/src/components/button/button.ionic.vars.scss index d543a781f3..ac3b926cca 100644 --- a/core/src/components/button/button.ionic.vars.scss +++ b/core/src/components/button/button.ionic.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // Ionic Button // ------------------------------------------------------------------------------- diff --git a/core/src/components/button/button.ios.vars.scss b/core/src/components/button/button.ios.vars.scss index 9b49c47e4c..ddfde16828 100644 --- a/core/src/components/button/button.ios.vars.scss +++ b/core/src/components/button/button.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Button // -------------------------------------------------- diff --git a/core/src/components/button/button.md.vars.scss b/core/src/components/button/button.md.vars.scss index 99f942769a..b83a96d7db 100644 --- a/core/src/components/button/button.md.vars.scss +++ b/core/src/components/button/button.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Button // -------------------------------------------------- diff --git a/core/src/components/button/button.vars.scss b/core/src/components/button/button.vars.scss index 448cc7b006..a548150d7c 100644 --- a/core/src/components/button/button.vars.scss +++ b/core/src/components/button/button.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Button // -------------------------------------------------- diff --git a/core/src/components/buttons/buttons.ios.vars.scss b/core/src/components/buttons/buttons.ios.vars.scss index e9784ca32b..94d20065a1 100644 --- a/core/src/components/buttons/buttons.ios.vars.scss +++ b/core/src/components/buttons/buttons.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../toolbar/toolbar.ios.vars"; // iOS Buttons diff --git a/core/src/components/buttons/buttons.md.vars.scss b/core/src/components/buttons/buttons.md.vars.scss index 55cba8ec54..91c84a1234 100644 --- a/core/src/components/buttons/buttons.md.vars.scss +++ b/core/src/components/buttons/buttons.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../toolbar/toolbar.md.vars"; // Material Design Buttons diff --git a/core/src/components/buttons/buttons.scss b/core/src/components/buttons/buttons.scss index d0e30a4587..a22fde576c 100644 --- a/core/src/components/buttons/buttons.scss +++ b/core/src/components/buttons/buttons.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host { display: flex; diff --git a/core/src/components/card-content/card-content.ios.vars.scss b/core/src/components/card-content/card-content.ios.vars.scss index 8bb5fa0383..43f7940ec8 100644 --- a/core/src/components/card-content/card-content.ios.vars.scss +++ b/core/src/components/card-content/card-content.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Card Header // -------------------------------------------------- diff --git a/core/src/components/card-content/card-content.md.vars.scss b/core/src/components/card-content/card-content.md.vars.scss index 8d436c15c9..24fbd4403b 100644 --- a/core/src/components/card-content/card-content.md.vars.scss +++ b/core/src/components/card-content/card-content.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Card Content // -------------------------------------------------- diff --git a/core/src/components/card-content/card-content.scss b/core/src/components/card-content/card-content.scss index 63bd558ae5..d879909f1b 100644 --- a/core/src/components/card-content/card-content.scss +++ b/core/src/components/card-content/card-content.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Card Content // -------------------------------------------------- diff --git a/core/src/components/card-header/card-header.ios.vars.scss b/core/src/components/card-header/card-header.ios.vars.scss index b261a51f1b..4f15b5661c 100644 --- a/core/src/components/card-header/card-header.ios.vars.scss +++ b/core/src/components/card-header/card-header.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Card Header // -------------------------------------------------- diff --git a/core/src/components/card-header/card-header.md.vars.scss b/core/src/components/card-header/card-header.md.vars.scss index e64451a202..52d8fe3798 100644 --- a/core/src/components/card-header/card-header.md.vars.scss +++ b/core/src/components/card-header/card-header.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Card Header // -------------------------------------------------- diff --git a/core/src/components/card-header/card-header.scss b/core/src/components/card-header/card-header.scss index 7e582af42b..b3caa8f170 100644 --- a/core/src/components/card-header/card-header.scss +++ b/core/src/components/card-header/card-header.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Card Header // -------------------------------------------------- diff --git a/core/src/components/card-subtitle/card-subtitle.ios.vars.scss b/core/src/components/card-subtitle/card-subtitle.ios.vars.scss index 86f221d011..787c56f849 100644 --- a/core/src/components/card-subtitle/card-subtitle.ios.vars.scss +++ b/core/src/components/card-subtitle/card-subtitle.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Card Subtitle // -------------------------------------------------- diff --git a/core/src/components/card-subtitle/card-subtitle.md.vars.scss b/core/src/components/card-subtitle/card-subtitle.md.vars.scss index 1a0c4f69c8..a7653478b0 100644 --- a/core/src/components/card-subtitle/card-subtitle.md.vars.scss +++ b/core/src/components/card-subtitle/card-subtitle.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Card Subtitle // -------------------------------------------------- diff --git a/core/src/components/card-subtitle/card-subtitle.scss b/core/src/components/card-subtitle/card-subtitle.scss index 80c50a72a1..dcd1cd1e46 100644 --- a/core/src/components/card-subtitle/card-subtitle.scss +++ b/core/src/components/card-subtitle/card-subtitle.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Card Subtitle // -------------------------------------------------- @@ -16,4 +16,4 @@ :host(.ion-color) { color: current-color(base); -} \ No newline at end of file +} diff --git a/core/src/components/card-title/card-title.ios.vars.scss b/core/src/components/card-title/card-title.ios.vars.scss index 43d4c74143..4d3294af3f 100644 --- a/core/src/components/card-title/card-title.ios.vars.scss +++ b/core/src/components/card-title/card-title.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Card Title // -------------------------------------------------- diff --git a/core/src/components/card-title/card-title.md.vars.scss b/core/src/components/card-title/card-title.md.vars.scss index 31914b32b8..313a80d38b 100644 --- a/core/src/components/card-title/card-title.md.vars.scss +++ b/core/src/components/card-title/card-title.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Card Title // -------------------------------------------------- diff --git a/core/src/components/card-title/card-title.scss b/core/src/components/card-title/card-title.scss index 9f8843568f..17a007ded6 100644 --- a/core/src/components/card-title/card-title.scss +++ b/core/src/components/card-title/card-title.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Card Title diff --git a/core/src/components/card/card.ios.vars.scss b/core/src/components/card/card.ios.vars.scss index ce9876ea26..626de98c6b 100755 --- a/core/src/components/card/card.ios.vars.scss +++ b/core/src/components/card/card.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Card // -------------------------------------------------- diff --git a/core/src/components/card/card.md.vars.scss b/core/src/components/card/card.md.vars.scss index cb13c43aee..aa660a3b19 100755 --- a/core/src/components/card/card.md.vars.scss +++ b/core/src/components/card/card.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Card // -------------------------------------------------- diff --git a/core/src/components/card/card.scss b/core/src/components/card/card.scss index adc828c29f..1d3b00a1a9 100755 --- a/core/src/components/card/card.scss +++ b/core/src/components/card/card.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Card // -------------------------------------------------- diff --git a/core/src/components/checkbox/checkbox.ios.vars.scss b/core/src/components/checkbox/checkbox.ios.vars.scss index b63650a309..b6c839668d 100644 --- a/core/src/components/checkbox/checkbox.ios.vars.scss +++ b/core/src/components/checkbox/checkbox.ios.vars.scss @@ -1,5 +1,5 @@ @use "sass:math"; -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Checkbox diff --git a/core/src/components/checkbox/checkbox.md.vars.scss b/core/src/components/checkbox/checkbox.md.vars.scss index d2359c4067..a89ccdaf29 100644 --- a/core/src/components/checkbox/checkbox.md.vars.scss +++ b/core/src/components/checkbox/checkbox.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Checkbox diff --git a/core/src/components/checkbox/checkbox.scss b/core/src/components/checkbox/checkbox.scss index 47e9f6d704..79a7e505d1 100644 --- a/core/src/components/checkbox/checkbox.scss +++ b/core/src/components/checkbox/checkbox.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./checkbox.vars.scss"; // Checkbox diff --git a/core/src/components/chip/chip.scss b/core/src/components/chip/chip.scss index 37a3f700f1..1be7cf4b8e 100644 --- a/core/src/components/chip/chip.scss +++ b/core/src/components/chip/chip.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./chip.vars"; :host { diff --git a/core/src/components/col/col.vars.scss b/core/src/components/col/col.vars.scss index ca89b021cc..88fc4991f4 100644 --- a/core/src/components/col/col.vars.scss +++ b/core/src/components/col/col.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "../grid/grid.mixins"; // Grid Column diff --git a/core/src/components/content/content.scss b/core/src/components/content/content.scss index 5f8b2afa83..e7206e140c 100644 --- a/core/src/components/content/content.scss +++ b/core/src/components/content/content.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Content // -------------------------------------------------- diff --git a/core/src/components/datetime-button/datetime-button.scss b/core/src/components/datetime-button/datetime-button.scss index 1570cfc4c7..757f97dce5 100644 --- a/core/src/components/datetime-button/datetime-button.scss +++ b/core/src/components/datetime-button/datetime-button.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Datetime Button // -------------------------------------------------- diff --git a/core/src/components/datetime/datetime.ios.scss b/core/src/components/datetime/datetime.ios.scss index 71bff22441..fe9299be88 100644 --- a/core/src/components/datetime/datetime.ios.scss +++ b/core/src/components/datetime/datetime.ios.scss @@ -1,6 +1,6 @@ @import "./datetime.scss"; @import "./datetime.ios.vars.scss"; -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; :host { --background: #{ion-color(light, base)}; diff --git a/core/src/components/datetime/datetime.md.scss b/core/src/components/datetime/datetime.md.scss index 7b3d78f5e8..d3359c68f6 100644 --- a/core/src/components/datetime/datetime.md.scss +++ b/core/src/components/datetime/datetime.md.scss @@ -1,6 +1,6 @@ @import "./datetime.scss"; @import "./datetime.md.vars.scss"; -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; :host { --background: var(--ion-color-step-100, var(--ion-background-color-step-100, #ffffff)); diff --git a/core/src/components/datetime/datetime.scss b/core/src/components/datetime/datetime.scss index 9c7a4b0a2c..057d1b8a11 100644 --- a/core/src/components/datetime/datetime.scss +++ b/core/src/components/datetime/datetime.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Datetime // -------------------------------------------------- diff --git a/core/src/components/fab-button/fab-button.ios.vars.scss b/core/src/components/fab-button/fab-button.ios.vars.scss index 1d1faa392a..e587be3867 100755 --- a/core/src/components/fab-button/fab-button.ios.vars.scss +++ b/core/src/components/fab-button/fab-button.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS FAB Button // -------------------------------------------------- diff --git a/core/src/components/fab-button/fab-button.md.vars.scss b/core/src/components/fab-button/fab-button.md.vars.scss index edd4f572a0..a3b78ae49e 100755 --- a/core/src/components/fab-button/fab-button.md.vars.scss +++ b/core/src/components/fab-button/fab-button.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design FAB Button // -------------------------------------------------- diff --git a/core/src/components/fab-button/fab-button.vars.scss b/core/src/components/fab-button/fab-button.vars.scss index 2556fec9b3..64cb009725 100755 --- a/core/src/components/fab-button/fab-button.vars.scss +++ b/core/src/components/fab-button/fab-button.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Floating Action Buttons // -------------------------------------------------- diff --git a/core/src/components/fab-list/fab-list.vars.scss b/core/src/components/fab-list/fab-list.vars.scss index eed9c736fa..34943a20c5 100644 --- a/core/src/components/fab-list/fab-list.vars.scss +++ b/core/src/components/fab-list/fab-list.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "../fab-button/fab-button.vars"; // Floating Action Button List diff --git a/core/src/components/fab/fab.vars.scss b/core/src/components/fab/fab.vars.scss index 13e2a09493..d345643bf9 100644 --- a/core/src/components/fab/fab.vars.scss +++ b/core/src/components/fab/fab.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "../fab-button/fab-button.vars"; // Floating Action Button Container diff --git a/core/src/components/footer/footer.ios.vars.scss b/core/src/components/footer/footer.ios.vars.scss index bb1311cdcd..d00e10118a 100644 --- a/core/src/components/footer/footer.ios.vars.scss +++ b/core/src/components/footer/footer.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Footer // -------------------------------------------------- diff --git a/core/src/components/footer/footer.md.vars.scss b/core/src/components/footer/footer.md.vars.scss index 38d8bd63a0..58f697a261 100644 --- a/core/src/components/footer/footer.md.vars.scss +++ b/core/src/components/footer/footer.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Footer // -------------------------------------------------- diff --git a/core/src/components/footer/footer.scss b/core/src/components/footer/footer.scss index c6b9c24d15..6b2d34a417 100644 --- a/core/src/components/footer/footer.scss +++ b/core/src/components/footer/footer.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Footer // -------------------------------------------------- @@ -16,4 +16,4 @@ ion-footer { ion-footer.footer-toolbar-padding ion-toolbar:last-of-type { padding-bottom: var(--ion-safe-area-bottom, 0); -} \ No newline at end of file +} diff --git a/core/src/components/grid/grid.mixins.scss b/core/src/components/grid/grid.mixins.scss index c1ddaf1908..c29ed609cb 100644 --- a/core/src/components/grid/grid.mixins.scss +++ b/core/src/components/grid/grid.mixins.scss @@ -1,5 +1,5 @@ -@import "../../themes/ionic.globals"; -@import "../../themes/ionic.mixins"; +@import "../../themes/globals"; +@import "../../themes/mixins"; // Responsive Mixins // -------------------------------------------------- diff --git a/core/src/components/grid/grid.vars.scss b/core/src/components/grid/grid.vars.scss index bdfd69bc9c..dc658f9109 100644 --- a/core/src/components/grid/grid.vars.scss +++ b/core/src/components/grid/grid.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./grid.mixins"; // Grid diff --git a/core/src/components/header/header.ios.vars.scss b/core/src/components/header/header.ios.vars.scss index a4e8272d6f..040c8ea440 100644 --- a/core/src/components/header/header.ios.vars.scss +++ b/core/src/components/header/header.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Header // -------------------------------------------------- diff --git a/core/src/components/header/header.md.vars.scss b/core/src/components/header/header.md.vars.scss index a99c36f93f..187df8d2f6 100644 --- a/core/src/components/header/header.md.vars.scss +++ b/core/src/components/header/header.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Header // -------------------------------------------------- diff --git a/core/src/components/header/header.scss b/core/src/components/header/header.scss index 108607ddf7..f95345fcb0 100644 --- a/core/src/components/header/header.scss +++ b/core/src/components/header/header.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Header // -------------------------------------------------- diff --git a/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.vars.scss b/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.vars.scss index 35c84a8776..cd03824ab3 100644 --- a/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.vars.scss +++ b/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // Material Design Infinite Scroll // -------------------------------------------------- diff --git a/core/src/components/infinite-scroll-content/infinite-scroll-content.md.vars.scss b/core/src/components/infinite-scroll-content/infinite-scroll-content.md.vars.scss index fb1b0d18ee..84cb4a7c35 100644 --- a/core/src/components/infinite-scroll-content/infinite-scroll-content.md.vars.scss +++ b/core/src/components/infinite-scroll-content/infinite-scroll-content.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Infinite Scroll // -------------------------------------------------- diff --git a/core/src/components/infinite-scroll-content/infinite-scroll-content.vars.scss b/core/src/components/infinite-scroll-content/infinite-scroll-content.vars.scss index 8fdd8d5775..2c7b122ba7 100644 --- a/core/src/components/infinite-scroll-content/infinite-scroll-content.vars.scss +++ b/core/src/components/infinite-scroll-content/infinite-scroll-content.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Infinite Scroll // -------------------------------------------------- diff --git a/core/src/components/input/input.ios.vars.scss b/core/src/components/input/input.ios.vars.scss index 238d9cd427..9f4f1f2f12 100644 --- a/core/src/components/input/input.ios.vars.scss +++ b/core/src/components/input/input.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Input diff --git a/core/src/components/input/input.md.vars.scss b/core/src/components/input/input.md.vars.scss index 952bc390ff..090577631a 100644 --- a/core/src/components/input/input.md.vars.scss +++ b/core/src/components/input/input.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Input diff --git a/core/src/components/input/input.vars.scss b/core/src/components/input/input.vars.scss index e21c162d17..0f0f2aee56 100644 --- a/core/src/components/input/input.vars.scss +++ b/core/src/components/input/input.vars.scss @@ -1 +1 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; diff --git a/core/src/components/item-divider/item-divider.ios.vars.scss b/core/src/components/item-divider/item-divider.ios.vars.scss index 73de9f08fc..d33ac05455 100644 --- a/core/src/components/item-divider/item-divider.ios.vars.scss +++ b/core/src/components/item-divider/item-divider.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Item Divider diff --git a/core/src/components/item-divider/item-divider.md.vars.scss b/core/src/components/item-divider/item-divider.md.vars.scss index f817b80b45..3a3b6b8384 100644 --- a/core/src/components/item-divider/item-divider.md.vars.scss +++ b/core/src/components/item-divider/item-divider.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Item Divider diff --git a/core/src/components/item-divider/item-divider.scss b/core/src/components/item-divider/item-divider.scss index 58ff5a1118..4654db6c4d 100644 --- a/core/src/components/item-divider/item-divider.scss +++ b/core/src/components/item-divider/item-divider.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Item Divider diff --git a/core/src/components/item-group/item-group.ios.vars.scss b/core/src/components/item-group/item-group.ios.vars.scss index 4658799381..17cfccc703 100644 --- a/core/src/components/item-group/item-group.ios.vars.scss +++ b/core/src/components/item-group/item-group.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Item Group // -------------------------------------------------- diff --git a/core/src/components/item-group/item-group.md.vars.scss b/core/src/components/item-group/item-group.md.vars.scss index dd1b400f56..04d8e6036a 100644 --- a/core/src/components/item-group/item-group.md.vars.scss +++ b/core/src/components/item-group/item-group.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Item Group // -------------------------------------------------- diff --git a/core/src/components/item-group/item-group.vars.scss b/core/src/components/item-group/item-group.vars.scss index 1c7bd2a4a9..2bcd90953c 100644 --- a/core/src/components/item-group/item-group.vars.scss +++ b/core/src/components/item-group/item-group.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Item Group diff --git a/core/src/components/item-option/item-option.ios.vars.scss b/core/src/components/item-option/item-option.ios.vars.scss index 5c63226dc4..2beccf5d8b 100644 --- a/core/src/components/item-option/item-option.ios.vars.scss +++ b/core/src/components/item-option/item-option.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Item Option // -------------------------------------------------- diff --git a/core/src/components/item-option/item-option.md.vars.scss b/core/src/components/item-option/item-option.md.vars.scss index 3e27b73ccf..287eafda63 100644 --- a/core/src/components/item-option/item-option.md.vars.scss +++ b/core/src/components/item-option/item-option.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Item Option // -------------------------------------------------- diff --git a/core/src/components/item-option/item-option.vars.scss b/core/src/components/item-option/item-option.vars.scss index bf9f10b867..7f47ab541e 100644 --- a/core/src/components/item-option/item-option.vars.scss +++ b/core/src/components/item-option/item-option.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Item Option // -------------------------------------------------- diff --git a/core/src/components/item-options/item-options.ios.vars.scss b/core/src/components/item-options/item-options.ios.vars.scss index 3f465ef332..59db83196c 100644 --- a/core/src/components/item-options/item-options.ios.vars.scss +++ b/core/src/components/item-options/item-options.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Item Options diff --git a/core/src/components/item-options/item-options.md.vars.scss b/core/src/components/item-options/item-options.md.vars.scss index dd746708d0..de743360ad 100644 --- a/core/src/components/item-options/item-options.md.vars.scss +++ b/core/src/components/item-options/item-options.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Item Options diff --git a/core/src/components/item-options/item-options.vars.scss b/core/src/components/item-options/item-options.vars.scss index b004661675..b26274f82d 100644 --- a/core/src/components/item-options/item-options.vars.scss +++ b/core/src/components/item-options/item-options.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Item Options // -------------------------------------------------- diff --git a/core/src/components/item-sliding/item-sliding.scss b/core/src/components/item-sliding/item-sliding.scss index c52b8d5d4e..6268304f98 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.globals"; +@import "../../themes/globals"; // Item Sliding // -------------------------------------------------- diff --git a/core/src/components/item/item.ios.vars.scss b/core/src/components/item/item.ios.vars.scss index 4ebbb24f0a..03beab15eb 100644 --- a/core/src/components/item/item.ios.vars.scss +++ b/core/src/components/item/item.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Item // -------------------------------------------------- diff --git a/core/src/components/item/item.md.vars.scss b/core/src/components/item/item.md.vars.scss index d16d30300d..5706168698 100644 --- a/core/src/components/item/item.md.vars.scss +++ b/core/src/components/item/item.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Item // -------------------------------------------------- diff --git a/core/src/components/item/item.vars.scss b/core/src/components/item/item.vars.scss index d0ebad2ee1..764ee9ef27 100644 --- a/core/src/components/item/item.vars.scss +++ b/core/src/components/item/item.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Item // -------------------------------------------------- diff --git a/core/src/components/label/label.ios.vars.scss b/core/src/components/label/label.ios.vars.scss index 4c277c0860..2d1459e9e4 100644 --- a/core/src/components/label/label.ios.vars.scss +++ b/core/src/components/label/label.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Label diff --git a/core/src/components/label/label.md.vars.scss b/core/src/components/label/label.md.vars.scss index ed785732a8..6f5223f5c8 100644 --- a/core/src/components/label/label.md.vars.scss +++ b/core/src/components/label/label.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Label diff --git a/core/src/components/label/label.scss b/core/src/components/label/label.scss index 103fcdfad0..628b3be2ba 100644 --- a/core/src/components/label/label.scss +++ b/core/src/components/label/label.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Label diff --git a/core/src/components/list-header/list-header.ios.vars.scss b/core/src/components/list-header/list-header.ios.vars.scss index f15afb19b5..f1e4f66fc8 100644 --- a/core/src/components/list-header/list-header.ios.vars.scss +++ b/core/src/components/list-header/list-header.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS List Header diff --git a/core/src/components/list-header/list-header.md.vars.scss b/core/src/components/list-header/list-header.md.vars.scss index 400d02ba82..2eba40af3e 100644 --- a/core/src/components/list-header/list-header.md.vars.scss +++ b/core/src/components/list-header/list-header.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design List Header diff --git a/core/src/components/list-header/list-header.scss b/core/src/components/list-header/list-header.scss index 9021f794d8..f658409708 100644 --- a/core/src/components/list-header/list-header.scss +++ b/core/src/components/list-header/list-header.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // List Header diff --git a/core/src/components/list/list.ios.vars.scss b/core/src/components/list/list.ios.vars.scss index 423d6aac6a..b67b9c451d 100644 --- a/core/src/components/list/list.ios.vars.scss +++ b/core/src/components/list/list.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS List diff --git a/core/src/components/list/list.md.vars.scss b/core/src/components/list/list.md.vars.scss index dd9ff16e6b..1adcc69a15 100644 --- a/core/src/components/list/list.md.vars.scss +++ b/core/src/components/list/list.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design List diff --git a/core/src/components/list/list.scss b/core/src/components/list/list.scss index 267b9023a2..d476a2e7a0 100644 --- a/core/src/components/list/list.scss +++ b/core/src/components/list/list.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // List diff --git a/core/src/components/loading/loading.ios.vars.scss b/core/src/components/loading/loading.ios.vars.scss index 92d1946bc2..5834be275e 100644 --- a/core/src/components/loading/loading.ios.vars.scss +++ b/core/src/components/loading/loading.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Loading Indicator // -------------------------------------------------- diff --git a/core/src/components/loading/loading.md.vars.scss b/core/src/components/loading/loading.md.vars.scss index ec8611debe..e65fe5f6e0 100644 --- a/core/src/components/loading/loading.md.vars.scss +++ b/core/src/components/loading/loading.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Loading Indicator // -------------------------------------------------- diff --git a/core/src/components/loading/loading.vars.scss b/core/src/components/loading/loading.vars.scss index e21c162d17..0f0f2aee56 100644 --- a/core/src/components/loading/loading.vars.scss +++ b/core/src/components/loading/loading.vars.scss @@ -1 +1 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; diff --git a/core/src/components/menu-button/menu-button.ios.scss b/core/src/components/menu-button/menu-button.ios.scss index c5d3abd75d..5f331edd2d 100644 --- a/core/src/components/menu-button/menu-button.ios.scss +++ b/core/src/components/menu-button/menu-button.ios.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "./menu-button"; // iOS Menu Button diff --git a/core/src/components/menu-button/menu-button.md.scss b/core/src/components/menu-button/menu-button.md.scss index 5065e5c492..3f7bc48a95 100644 --- a/core/src/components/menu-button/menu-button.md.scss +++ b/core/src/components/menu-button/menu-button.md.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "./menu-button"; // MD Menu Button diff --git a/core/src/components/menu-button/menu-button.scss b/core/src/components/menu-button/menu-button.scss index 1cc38d63e4..a0e0159223 100644 --- a/core/src/components/menu-button/menu-button.scss +++ b/core/src/components/menu-button/menu-button.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Menu Button // -------------------------------------------------- diff --git a/core/src/components/menu/menu.ios.vars.scss b/core/src/components/menu/menu.ios.vars.scss index c2936ddff7..638c2d562d 100644 --- a/core/src/components/menu/menu.ios.vars.scss +++ b/core/src/components/menu/menu.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Menu // -------------------------------------------------- diff --git a/core/src/components/menu/menu.md.vars.scss b/core/src/components/menu/menu.md.vars.scss index 6acf939cce..9d398b8657 100644 --- a/core/src/components/menu/menu.md.vars.scss +++ b/core/src/components/menu/menu.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Menu // -------------------------------------------------- diff --git a/core/src/components/menu/menu.vars.scss b/core/src/components/menu/menu.vars.scss index 236417c136..843b1c5bfa 100644 --- a/core/src/components/menu/menu.vars.scss +++ b/core/src/components/menu/menu.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Menu // -------------------------------------------------- diff --git a/core/src/components/modal/modal.ios.vars.scss b/core/src/components/modal/modal.ios.vars.scss index 664aefd331..660e44ad16 100644 --- a/core/src/components/modal/modal.ios.vars.scss +++ b/core/src/components/modal/modal.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Modals // -------------------------------------------------- diff --git a/core/src/components/modal/modal.md.vars.scss b/core/src/components/modal/modal.md.vars.scss index bf77d69a7e..a6f18d470d 100644 --- a/core/src/components/modal/modal.md.vars.scss +++ b/core/src/components/modal/modal.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Modals // -------------------------------------------------- diff --git a/core/src/components/modal/modal.vars.scss b/core/src/components/modal/modal.vars.scss index f881168971..b984142068 100644 --- a/core/src/components/modal/modal.vars.scss +++ b/core/src/components/modal/modal.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Modals // -------------------------------------------------- diff --git a/core/src/components/nav/nav.scss b/core/src/components/nav/nav.scss index 125bb460fb..29bf95101c 100644 --- a/core/src/components/nav/nav.scss +++ b/core/src/components/nav/nav.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host { @include position(0, 0, 0, 0); diff --git a/core/src/components/note/note.ios.vars.scss b/core/src/components/note/note.ios.vars.scss index b452c16e41..2efb1f5c02 100644 --- a/core/src/components/note/note.ios.vars.scss +++ b/core/src/components/note/note.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Note // -------------------------------------------------- diff --git a/core/src/components/note/note.md.vars.scss b/core/src/components/note/note.md.vars.scss index f08f55ef91..923d3c00cc 100644 --- a/core/src/components/note/note.md.vars.scss +++ b/core/src/components/note/note.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Note // -------------------------------------------------- diff --git a/core/src/components/picker-column-option/picker-column-option.scss b/core/src/components/picker-column-option/picker-column-option.scss index a414a3580e..89fb391ee7 100644 --- a/core/src/components/picker-column-option/picker-column-option.scss +++ b/core/src/components/picker-column-option/picker-column-option.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Picker Column // -------------------------------------------------- diff --git a/core/src/components/picker-column/picker-column.scss b/core/src/components/picker-column/picker-column.scss index e4008f3824..d99f0d4b00 100644 --- a/core/src/components/picker-column/picker-column.scss +++ b/core/src/components/picker-column/picker-column.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Picker Column // -------------------------------------------------- diff --git a/core/src/components/picker-legacy-column/picker-column.scss b/core/src/components/picker-legacy-column/picker-column.scss index 9fe984c4e4..29bcd694f3 100644 --- a/core/src/components/picker-legacy-column/picker-column.scss +++ b/core/src/components/picker-legacy-column/picker-column.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Picker Column // -------------------------------------------------- diff --git a/core/src/components/picker-legacy/picker.ios.vars.scss b/core/src/components/picker-legacy/picker.ios.vars.scss index 6bb3e14e06..175eb0219c 100644 --- a/core/src/components/picker-legacy/picker.ios.vars.scss +++ b/core/src/components/picker-legacy/picker.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Picker // -------------------------------------------------- diff --git a/core/src/components/picker-legacy/picker.md.vars.scss b/core/src/components/picker-legacy/picker.md.vars.scss index d2f8675beb..5ac6516aad 100644 --- a/core/src/components/picker-legacy/picker.md.vars.scss +++ b/core/src/components/picker-legacy/picker.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Picker // -------------------------------------------------- diff --git a/core/src/components/picker-legacy/picker.vars.scss b/core/src/components/picker-legacy/picker.vars.scss index 31a7ffd2b8..3f7af7cc39 100644 --- a/core/src/components/picker-legacy/picker.vars.scss +++ b/core/src/components/picker-legacy/picker.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Picker // -------------------------------------------------- diff --git a/core/src/components/picker/picker.ios.scss b/core/src/components/picker/picker.ios.scss index 76f99175c6..dcdad1cf4a 100644 --- a/core/src/components/picker/picker.ios.scss +++ b/core/src/components/picker/picker.ios.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "./picker"; :host .picker-before { diff --git a/core/src/components/picker/picker.md.scss b/core/src/components/picker/picker.md.scss index cd5d8b9411..ad22363c20 100644 --- a/core/src/components/picker/picker.md.scss +++ b/core/src/components/picker/picker.md.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "./picker"; :host .picker-before { diff --git a/core/src/components/picker/picker.vars.scss b/core/src/components/picker/picker.vars.scss index 1a696a5e9e..f907d90202 100644 --- a/core/src/components/picker/picker.vars.scss +++ b/core/src/components/picker/picker.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; $picker-fade-background-fallback: var(--background-rgb, var(--ion-background-color-rgb, 255, 255, 255)); $picker-fade-background: var(--fade-background-rgb, $picker-fade-background-fallback); diff --git a/core/src/components/popover/popover.ios.vars.scss b/core/src/components/popover/popover.ios.vars.scss index c5f9cbe8f4..7789f5c7ed 100644 --- a/core/src/components/popover/popover.ios.vars.scss +++ b/core/src/components/popover/popover.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Popover // -------------------------------------------------- diff --git a/core/src/components/popover/popover.md.vars.scss b/core/src/components/popover/popover.md.vars.scss index 4241aea4de..e6801bc1f4 100644 --- a/core/src/components/popover/popover.md.vars.scss +++ b/core/src/components/popover/popover.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Popover // -------------------------------------------------- diff --git a/core/src/components/popover/popover.vars.scss b/core/src/components/popover/popover.vars.scss index 2ce9fdc7ba..122174a56b 100644 --- a/core/src/components/popover/popover.vars.scss +++ b/core/src/components/popover/popover.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Popover // -------------------------------------------------- @@ -7,4 +7,4 @@ $popover-text-color: $text-color !default; /// @prop - Background color of the popover content -$popover-background-color: $background-color !default; \ No newline at end of file +$popover-background-color: $background-color !default; diff --git a/core/src/components/progress-bar/progress-bar.scss b/core/src/components/progress-bar/progress-bar.scss index 9385c03e78..56c4e4dfa4 100644 --- a/core/src/components/progress-bar/progress-bar.scss +++ b/core/src/components/progress-bar/progress-bar.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Progress bar // ------------------------------------------------------------------------ diff --git a/core/src/components/radio/radio.ios.vars.scss b/core/src/components/radio/radio.ios.vars.scss index 459e96dd15..3e8a073d07 100644 --- a/core/src/components/radio/radio.ios.vars.scss +++ b/core/src/components/radio/radio.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Radio diff --git a/core/src/components/radio/radio.md.vars.scss b/core/src/components/radio/radio.md.vars.scss index 1dfa6c780f..b97719b8e7 100644 --- a/core/src/components/radio/radio.md.vars.scss +++ b/core/src/components/radio/radio.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Radio diff --git a/core/src/components/radio/radio.scss b/core/src/components/radio/radio.scss index 0b9bc51c2d..a3de11d934 100644 --- a/core/src/components/radio/radio.scss +++ b/core/src/components/radio/radio.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./radio.vars.scss"; // Radio diff --git a/core/src/components/range/range.ios.vars.scss b/core/src/components/range/range.ios.vars.scss index b51ed489e9..b8ea56e4f4 100644 --- a/core/src/components/range/range.ios.vars.scss +++ b/core/src/components/range/range.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Range // -------------------------------------------------- diff --git a/core/src/components/range/range.md.vars.scss b/core/src/components/range/range.md.vars.scss index c5c0293c8c..4a1fae4bea 100644 --- a/core/src/components/range/range.md.vars.scss +++ b/core/src/components/range/range.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Range // -------------------------------------------------- diff --git a/core/src/components/range/range.scss b/core/src/components/range/range.scss index 404fa5d77b..f6623cea4f 100644 --- a/core/src/components/range/range.scss +++ b/core/src/components/range/range.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./range.vars.scss"; // Range diff --git a/core/src/components/refresher/refresher.ios.vars.scss b/core/src/components/refresher/refresher.ios.vars.scss index bc4dc4ed9c..be2131d234 100644 --- a/core/src/components/refresher/refresher.ios.vars.scss +++ b/core/src/components/refresher/refresher.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; /// @prop - Color of the refresher icon $refresher-ios-icon-color: $text-color !default; diff --git a/core/src/components/refresher/refresher.md.vars.scss b/core/src/components/refresher/refresher.md.vars.scss index 3e893b0ce8..338af748d0 100644 --- a/core/src/components/refresher/refresher.md.vars.scss +++ b/core/src/components/refresher/refresher.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; /// @prop - Color of the refresher icon $refresher-md-icon-color: $text-color !default; diff --git a/core/src/components/refresher/refresher.scss b/core/src/components/refresher/refresher.scss index 29949ebc1c..98e01a38a8 100644 --- a/core/src/components/refresher/refresher.scss +++ b/core/src/components/refresher/refresher.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./refresher.vars"; ion-refresher { diff --git a/core/src/components/reorder-group/reorder-group.vars.scss b/core/src/components/reorder-group/reorder-group.vars.scss index a43be46d56..5fd5bf242f 100644 --- a/core/src/components/reorder-group/reorder-group.vars.scss +++ b/core/src/components/reorder-group/reorder-group.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Reorder Group // -------------------------------------------------- diff --git a/core/src/components/reorder/reorder.ios.vars.scss b/core/src/components/reorder/reorder.ios.vars.scss index 723f9324d7..b747701100 100644 --- a/core/src/components/reorder/reorder.ios.vars.scss +++ b/core/src/components/reorder/reorder.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Reorder // -------------------------------------------------- diff --git a/core/src/components/reorder/reorder.md.vars.scss b/core/src/components/reorder/reorder.md.vars.scss index ebf7214b28..978e56f388 100644 --- a/core/src/components/reorder/reorder.md.vars.scss +++ b/core/src/components/reorder/reorder.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Reorder // -------------------------------------------------- diff --git a/core/src/components/ripple-effect/ripple-effect.scss b/core/src/components/ripple-effect/ripple-effect.scss index f4937518f7..99142ce78b 100644 --- a/core/src/components/ripple-effect/ripple-effect.scss +++ b/core/src/components/ripple-effect/ripple-effect.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Material Design Ripple Effect diff --git a/core/src/components/router-link/router-link.scss b/core/src/components/router-link/router-link.scss index 89b4cff28b..f8761eb241 100644 --- a/core/src/components/router-link/router-link.scss +++ b/core/src/components/router-link/router-link.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Anchor // -------------------------------------------------- diff --git a/core/src/components/router-outlet/router-outlet.scss b/core/src/components/router-outlet/router-outlet.scss index 125bb460fb..29bf95101c 100644 --- a/core/src/components/router-outlet/router-outlet.scss +++ b/core/src/components/router-outlet/router-outlet.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host { @include position(0, 0, 0, 0); diff --git a/core/src/components/row/row.vars.scss b/core/src/components/row/row.vars.scss index 63c075fdbe..97fd693a8c 100644 --- a/core/src/components/row/row.vars.scss +++ b/core/src/components/row/row.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "../grid/grid.mixins"; // Row diff --git a/core/src/components/searchbar/searchbar.ios.vars.scss b/core/src/components/searchbar/searchbar.ios.vars.scss index 0bdb096617..701707aee1 100644 --- a/core/src/components/searchbar/searchbar.ios.vars.scss +++ b/core/src/components/searchbar/searchbar.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Searchbar // -------------------------------------------------- diff --git a/core/src/components/searchbar/searchbar.md.vars.scss b/core/src/components/searchbar/searchbar.md.vars.scss index 0af1072dc2..657037d49e 100644 --- a/core/src/components/searchbar/searchbar.md.vars.scss +++ b/core/src/components/searchbar/searchbar.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Searchbar // -------------------------------------------------- diff --git a/core/src/components/searchbar/searchbar.scss b/core/src/components/searchbar/searchbar.scss index 0293b5b7bf..d659ac5d5b 100644 --- a/core/src/components/searchbar/searchbar.scss +++ b/core/src/components/searchbar/searchbar.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Searchbar // -------------------------------------------------- diff --git a/core/src/components/segment-button/segment-button.ios.vars.scss b/core/src/components/segment-button/segment-button.ios.vars.scss index 77dce9d42d..ffda3befe3 100644 --- a/core/src/components/segment-button/segment-button.ios.vars.scss +++ b/core/src/components/segment-button/segment-button.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Segment Button // -------------------------------------------------- diff --git a/core/src/components/segment-button/segment-button.md.vars.scss b/core/src/components/segment-button/segment-button.md.vars.scss index 35ce67c163..eca9d80680 100644 --- a/core/src/components/segment-button/segment-button.md.vars.scss +++ b/core/src/components/segment-button/segment-button.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Segment Button // -------------------------------------------------- diff --git a/core/src/components/segment-button/segment-button.scss b/core/src/components/segment-button/segment-button.scss index fe89437bcc..eb46c0f910 100644 --- a/core/src/components/segment-button/segment-button.scss +++ b/core/src/components/segment-button/segment-button.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Segment Button // -------------------------------------------------- diff --git a/core/src/components/segment/segment.ios.vars.scss b/core/src/components/segment/segment.ios.vars.scss index f7a9161644..ad20f42505 100644 --- a/core/src/components/segment/segment.ios.vars.scss +++ b/core/src/components/segment/segment.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../segment-button/segment-button.ios.vars"; // iOS Segment diff --git a/core/src/components/segment/segment.md.vars.scss b/core/src/components/segment/segment.md.vars.scss index ee98aab17f..4fa6f192b2 100644 --- a/core/src/components/segment/segment.md.vars.scss +++ b/core/src/components/segment/segment.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../segment-button/segment-button.md.vars"; // Material Design Segment diff --git a/core/src/components/segment/segment.scss b/core/src/components/segment/segment.scss index f4e8ca9cfe..1df602f86a 100644 --- a/core/src/components/segment/segment.scss +++ b/core/src/components/segment/segment.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Segment // -------------------------------------------------- diff --git a/core/src/components/select-popover/select-popover.ios.vars.scss b/core/src/components/select-popover/select-popover.ios.vars.scss index 05ef1b1b63..c09833051d 100644 --- a/core/src/components/select-popover/select-popover.ios.vars.scss +++ b/core/src/components/select-popover/select-popover.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Select Popover diff --git a/core/src/components/select-popover/select-popover.md.vars.scss b/core/src/components/select-popover/select-popover.md.vars.scss index a0ea2826b9..2fd9d7d1c2 100644 --- a/core/src/components/select-popover/select-popover.md.vars.scss +++ b/core/src/components/select-popover/select-popover.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Select Popover diff --git a/core/src/components/select-popover/select-popover.scss b/core/src/components/select-popover/select-popover.scss index c22aa27321..961491227b 100644 --- a/core/src/components/select-popover/select-popover.scss +++ b/core/src/components/select-popover/select-popover.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host ion-list { @include margin(0); diff --git a/core/src/components/select/select.ios.vars.scss b/core/src/components/select/select.ios.vars.scss index 57677a8438..50ee152fb3 100644 --- a/core/src/components/select/select.ios.vars.scss +++ b/core/src/components/select/select.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Select diff --git a/core/src/components/select/select.md.vars.scss b/core/src/components/select/select.md.vars.scss index a6125e618d..bda1405b00 100644 --- a/core/src/components/select/select.md.vars.scss +++ b/core/src/components/select/select.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Select diff --git a/core/src/components/select/select.vars.scss b/core/src/components/select/select.vars.scss index ae137c052b..eebf1d7bd7 100644 --- a/core/src/components/select/select.vars.scss +++ b/core/src/components/select/select.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; /// @prop - Margin start of the select icon $select-icon-margin-start: 4px !default; diff --git a/core/src/components/skeleton-text/skeleton-text.vars.scss b/core/src/components/skeleton-text/skeleton-text.vars.scss index 3ebd68d936..b023fac55a 100644 --- a/core/src/components/skeleton-text/skeleton-text.vars.scss +++ b/core/src/components/skeleton-text/skeleton-text.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Skeleton Text // -------------------------------------------------- diff --git a/core/src/components/spinner/spinner.scss b/core/src/components/spinner/spinner.scss index 40dad2d102..3febff9a52 100644 --- a/core/src/components/spinner/spinner.scss +++ b/core/src/components/spinner/spinner.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Spinners // -------------------------------------------------- diff --git a/core/src/components/split-pane/split-pane.ios.vars.scss b/core/src/components/split-pane/split-pane.ios.vars.scss index 67a968d9c5..1390e3a913 100644 --- a/core/src/components/split-pane/split-pane.ios.vars.scss +++ b/core/src/components/split-pane/split-pane.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // Split Pane // -------------------------------------------------- diff --git a/core/src/components/split-pane/split-pane.md.vars.scss b/core/src/components/split-pane/split-pane.md.vars.scss index a600f620fa..22c6f3621f 100644 --- a/core/src/components/split-pane/split-pane.md.vars.scss +++ b/core/src/components/split-pane/split-pane.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Split Pane // -------------------------------------------------- diff --git a/core/src/components/split-pane/split-pane.vars.scss b/core/src/components/split-pane/split-pane.vars.scss index e7df6a8a01..0a193af73b 100644 --- a/core/src/components/split-pane/split-pane.vars.scss +++ b/core/src/components/split-pane/split-pane.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Split Pane // -------------------------------------------------- diff --git a/core/src/components/tab-bar/tab-bar.ios.vars.scss b/core/src/components/tab-bar/tab-bar.ios.vars.scss index c4ba6aebcc..d8b6d5493d 100644 --- a/core/src/components/tab-bar/tab-bar.ios.vars.scss +++ b/core/src/components/tab-bar/tab-bar.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../tab-button/tab-button.ios.vars"; // iOS Tab Bar @@ -11,4 +11,4 @@ $tab-bar-ios-translucent-background-color-alpha: .8 !default; $tab-bar-ios-translucent-background-color: rgba($background-color-rgb, $tab-bar-ios-translucent-background-color-alpha) !default; /// @prop - Filter of the translucent tab bar background color -$tab-bar-ios-translucent-filter: saturate(210%) blur(20px) !default; \ No newline at end of file +$tab-bar-ios-translucent-filter: saturate(210%) blur(20px) !default; diff --git a/core/src/components/tab-bar/tab-bar.md.scss b/core/src/components/tab-bar/tab-bar.md.scss index 5b2346936a..d275e02ddf 100644 --- a/core/src/components/tab-bar/tab-bar.md.scss +++ b/core/src/components/tab-bar/tab-bar.md.scss @@ -1,5 +1,5 @@ @import "./tab-bar"; -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../tab-button/tab-button.md.vars"; :host { @@ -11,4 +11,4 @@ --color-selected: #{$tabbar-md-color-selected}; height: 56px; -} \ No newline at end of file +} diff --git a/core/src/components/tab-bar/tab-bar.scss b/core/src/components/tab-bar/tab-bar.scss index 05c2472042..a5649c01de 100644 --- a/core/src/components/tab-bar/tab-bar.scss +++ b/core/src/components/tab-bar/tab-bar.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host { /** diff --git a/core/src/components/tab-button/tab-button.ios.vars.scss b/core/src/components/tab-button/tab-button.ios.vars.scss index 37b844d73a..9e9370a981 100644 --- a/core/src/components/tab-button/tab-button.ios.vars.scss +++ b/core/src/components/tab-button/tab-button.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Tabs // -------------------------------------------------- diff --git a/core/src/components/tab-button/tab-button.md.vars.scss b/core/src/components/tab-button/tab-button.md.vars.scss index ea005b4509..5b4a291e1f 100644 --- a/core/src/components/tab-button/tab-button.md.vars.scss +++ b/core/src/components/tab-button/tab-button.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Tabs // -------------------------------------------------- diff --git a/core/src/components/tab-button/tab-button.scss b/core/src/components/tab-button/tab-button.scss index 7bfd405dd3..f72fb2162f 100644 --- a/core/src/components/tab-button/tab-button.scss +++ b/core/src/components/tab-button/tab-button.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host { /** diff --git a/core/src/components/tabs/tabs.scss b/core/src/components/tabs/tabs.scss index 969f283f51..7ebe8fa08e 100644 --- a/core/src/components/tabs/tabs.scss +++ b/core/src/components/tabs/tabs.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; :host { @include position(0, 0, 0, 0); diff --git a/core/src/components/text/text.scss b/core/src/components/text/text.scss index 1d2d1413af..4bafea625c 100644 --- a/core/src/components/text/text.scss +++ b/core/src/components/text/text.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Text // -------------------------------------------------- diff --git a/core/src/components/textarea/textarea.ios.vars.scss b/core/src/components/textarea/textarea.ios.vars.scss index c6f807af1e..68f8ab5c6b 100644 --- a/core/src/components/textarea/textarea.ios.vars.scss +++ b/core/src/components/textarea/textarea.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Textarea diff --git a/core/src/components/textarea/textarea.md.vars.scss b/core/src/components/textarea/textarea.md.vars.scss index 40a864039c..f441b8d1c7 100644 --- a/core/src/components/textarea/textarea.md.vars.scss +++ b/core/src/components/textarea/textarea.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Textarea diff --git a/core/src/components/textarea/textarea.vars.scss b/core/src/components/textarea/textarea.vars.scss index 1b20bb6ecd..77ee1d183e 100644 --- a/core/src/components/textarea/textarea.vars.scss +++ b/core/src/components/textarea/textarea.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; /// @prop - The bottom padding of the textarea element. /// The value 8px is to add additional spacing for auto grow and scrollable textareas. diff --git a/core/src/components/thumbnail/thumbnail.scss b/core/src/components/thumbnail/thumbnail.scss index 8af268d95d..90a314a86c 100644 --- a/core/src/components/thumbnail/thumbnail.scss +++ b/core/src/components/thumbnail/thumbnail.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Thumbnail diff --git a/core/src/components/title/title.scss b/core/src/components/title/title.scss index 48680a97d3..9b3a89eed8 100644 --- a/core/src/components/title/title.scss +++ b/core/src/components/title/title.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Title // -------------------------------------------------- diff --git a/core/src/components/toast/toast.ios.vars.scss b/core/src/components/toast/toast.ios.vars.scss index 60aa1c4a4c..87cff4570b 100644 --- a/core/src/components/toast/toast.ios.vars.scss +++ b/core/src/components/toast/toast.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Toast // -------------------------------------------------- diff --git a/core/src/components/toast/toast.md.vars.scss b/core/src/components/toast/toast.md.vars.scss index 158815aec6..2627589648 100644 --- a/core/src/components/toast/toast.md.vars.scss +++ b/core/src/components/toast/toast.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Toast // -------------------------------------------------- diff --git a/core/src/components/toast/toast.vars.scss b/core/src/components/toast/toast.vars.scss index 98d53a85d3..129b11f520 100644 --- a/core/src/components/toast/toast.vars.scss +++ b/core/src/components/toast/toast.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Toast // -------------------------------------------------- diff --git a/core/src/components/toggle/toggle.ios.vars.scss b/core/src/components/toggle/toggle.ios.vars.scss index e95847dd7b..845cf71462 100644 --- a/core/src/components/toggle/toggle.ios.vars.scss +++ b/core/src/components/toggle/toggle.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; @import "../item/item.ios.vars"; // iOS Toggle diff --git a/core/src/components/toggle/toggle.md.vars.scss b/core/src/components/toggle/toggle.md.vars.scss index 7377082f00..047e28fd03 100644 --- a/core/src/components/toggle/toggle.md.vars.scss +++ b/core/src/components/toggle/toggle.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; @import "../item/item.md.vars"; // Material Design Toggle diff --git a/core/src/components/toggle/toggle.scss b/core/src/components/toggle/toggle.scss index 89ce182bb5..9026377587 100644 --- a/core/src/components/toggle/toggle.scss +++ b/core/src/components/toggle/toggle.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; @import "./toggle.vars.scss"; // Toggle diff --git a/core/src/components/toolbar/toolbar.ios.vars.scss b/core/src/components/toolbar/toolbar.ios.vars.scss index 0648a2efe1..43f4dbc193 100644 --- a/core/src/components/toolbar/toolbar.ios.vars.scss +++ b/core/src/components/toolbar/toolbar.ios.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/globals.ios"; // iOS Toolbar // -------------------------------------------------- diff --git a/core/src/components/toolbar/toolbar.md.vars.scss b/core/src/components/toolbar/toolbar.md.vars.scss index dc713a3424..c48d387f2c 100644 --- a/core/src/components/toolbar/toolbar.md.vars.scss +++ b/core/src/components/toolbar/toolbar.md.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.md"; +@import "../../themes/globals.md"; // Material Design Toolbar // -------------------------------------------------- diff --git a/core/src/components/toolbar/toolbar.scss b/core/src/components/toolbar/toolbar.scss index 92cf570651..48ea0fb558 100644 --- a/core/src/components/toolbar/toolbar.scss +++ b/core/src/components/toolbar/toolbar.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals"; +@import "../../themes/globals"; // Toolbar // -------------------------------------------------- diff --git a/core/src/css/core.scss b/core/src/css/core.scss index 34b2379282..cfb9fd49e6 100644 --- a/core/src/css/core.scss +++ b/core/src/css/core.scss @@ -1,5 +1,5 @@ @use "sass:map"; -@import "../themes/ionic.globals"; +@import "../themes/globals"; @import "../components/menu/menu.ios.vars"; @import "../components/menu/menu.md.vars"; diff --git a/core/src/css/display.scss b/core/src/css/display.scss index 30b1db4095..56b9957d2f 100644 --- a/core/src/css/display.scss +++ b/core/src/css/display.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Display // -------------------------------------------------- diff --git a/core/src/css/float-elements.scss b/core/src/css/float-elements.scss index 0e543e3404..31aca10f89 100644 --- a/core/src/css/float-elements.scss +++ b/core/src/css/float-elements.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Float Elements // -------------------------------------------------- diff --git a/core/src/css/ionic-swiper.scss b/core/src/css/ionic-swiper.scss index f5f12f9a35..dae27cfad0 100644 --- a/core/src/css/ionic-swiper.scss +++ b/core/src/css/ionic-swiper.scss @@ -1,4 +1,4 @@ -@import "../themes/ionic.globals.ios.scss"; +@import "../themes/globals.ios.scss"; // Slides // -------------------------------------------------- diff --git a/core/src/css/padding.scss b/core/src/css/padding.scss index 3ece7b9bfc..3b4eecf1a7 100644 --- a/core/src/css/padding.scss +++ b/core/src/css/padding.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Element Space diff --git a/core/src/css/palettes/high-contrast-dark.scss b/core/src/css/palettes/high-contrast-dark.scss index 927cbeb688..38ccf24491 100644 --- a/core/src/css/palettes/high-contrast-dark.scss +++ b/core/src/css/palettes/high-contrast-dark.scss @@ -1,5 +1,5 @@ @use "sass:map"; -@import "../../themes/ionic.functions.color"; +@import "../../themes/functions"; $primary: #7cabff !default; $secondary: #62bdff !default; @@ -111,7 +111,7 @@ $lightest-text-color: $text-color; @mixin high-contrast-dark-ios-palette() { $background-color: #000000; - + & { --ion-background-color: #{$background-color}; --ion-background-color-rgb: #{color-to-rgb-list($background-color)}; @@ -175,7 +175,7 @@ $lightest-text-color: $text-color; @mixin high-contrast-dark-md-palette() { $background-color: #121212; - + & { --ion-background-color: #{$background-color}; --ion-background-color-rgb: #{color-to-rgb-list($background-color)}; diff --git a/core/src/css/palettes/high-contrast.scss b/core/src/css/palettes/high-contrast.scss index ec7152c211..21c0c2dbfc 100644 --- a/core/src/css/palettes/high-contrast.scss +++ b/core/src/css/palettes/high-contrast.scss @@ -1,5 +1,5 @@ @use "sass:map"; -@import "../../themes/ionic.functions.color"; +@import "../../themes/functions"; $primary: #003fae !default; $secondary: #01487b !default; diff --git a/core/src/css/structure.scss b/core/src/css/structure.scss index 1e39d0296e..2c4b1bd43b 100644 --- a/core/src/css/structure.scss +++ b/core/src/css/structure.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Structure diff --git a/core/src/css/text-alignment.scss b/core/src/css/text-alignment.scss index 20f8184f2e..37f9ab30d6 100644 --- a/core/src/css/text-alignment.scss +++ b/core/src/css/text-alignment.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Text Alignment // -------------------------------------------------- diff --git a/core/src/css/text-transformation.scss b/core/src/css/text-transformation.scss index 631e9a0fb4..f5e330482e 100644 --- a/core/src/css/text-transformation.scss +++ b/core/src/css/text-transformation.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Text Transformation // -------------------------------------------------- diff --git a/core/src/css/typography.scss b/core/src/css/typography.scss index d1474a38d9..a931dd9358 100644 --- a/core/src/css/typography.scss +++ b/core/src/css/typography.scss @@ -1,5 +1,5 @@ -@import "../themes/ionic.globals"; -@import "../themes/ionic.mixins"; +@import "../themes/globals"; +@import "../themes/mixins"; // Typography // -------------------------------------------------- diff --git a/core/src/themes/default.ionic.scss b/core/src/themes/default.ionic.scss new file mode 100644 index 0000000000..7c0b6850d8 --- /dev/null +++ b/core/src/themes/default.ionic.scss @@ -0,0 +1,4 @@ +// Ionic Theme +// ------------------------------------------------------------------------------------------- +// This file should only contain variables that are +// used to theme the application colors for the Ionic theme. diff --git a/core/src/themes/ionic.theme.default.ios.scss b/core/src/themes/default.ios.scss similarity index 94% rename from core/src/themes/ionic.theme.default.ios.scss rename to core/src/themes/default.ios.scss index c5c5e7045a..d282c03ea5 100644 --- a/core/src/themes/ionic.theme.default.ios.scss +++ b/core/src/themes/default.ios.scss @@ -1,8 +1,7 @@ // Ionic iOS Theme // ------------------------------------------------------------------------------------------- -// This file contains the theme variables shared -// between modes. This should only include variables -// used to theme the application colors for iOS. +// This file should only contain variables that are +// used to theme the application colors for the iOS theme. // iOS General Colors // -------------------------------------------------- diff --git a/core/src/themes/ionic.theme.default.md.scss b/core/src/themes/default.md.scss similarity index 97% rename from core/src/themes/ionic.theme.default.md.scss rename to core/src/themes/default.md.scss index 14f1f34c7a..0e3c2d8289 100644 --- a/core/src/themes/ionic.theme.default.md.scss +++ b/core/src/themes/default.md.scss @@ -2,8 +2,8 @@ // Material Design Default Theme // -------------------------------------------------- // This file should only contain variables that are -// used to theme the application colors for Material -// Design. +// used to theme the application colors for the Material +// Design theme. // Material Design General Colors // -------------------------------------------------- diff --git a/core/src/themes/ionic.theme.default.scss b/core/src/themes/default.scss similarity index 100% rename from core/src/themes/ionic.theme.default.scss rename to core/src/themes/default.scss diff --git a/core/src/themes/functions.scss b/core/src/themes/functions.scss new file mode 100644 index 0000000000..d7c3a24f8c --- /dev/null +++ b/core/src/themes/functions.scss @@ -0,0 +1,363 @@ + +@use "sass:color"; +@use "sass:list"; +@use "sass:map"; +@use "sass:math"; +@use "sass:meta"; +@use "sass:string"; + +// TODO can we combine the following two variables +// and combine the functions that use them? +$browser-context: 16; +$baselineSize: 16px !default; +$baselineUnit: 1rem !default; + +/** + * Convert a pixels given value into rem + * + * @param pixels - Value in pixels to be converted (i.e. px) + * @param context (optional) - Baseline value + */ +@function px-to-rem($pixels, $context: $browser-context) { + @return math.div($pixels, $context) * 1rem; +} + +/** + * Convert a font size to a dynamic font size. + * Fonts that participate in Dynamic Type should use + * dynamic font sizes. + * @param size - The initial font size including the unit (i.e. px or pt) + * @param unit (optional) - The unit to convert to. Use this if you want to + * convert to a unit other than $baselineUnit. + */ +@function dynamic-font($size, $unit: $baselineUnit) { + @return (math.div($size, $baselineSize)) * $unit; +} + +/** + * Convert a font size to a dynamic font size but impose + * a maximum font size. + * @param size - The initial font size including the unit (i.e. px or pt) + * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale). + * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to + * convert to a unit other than $baselineUnit. + */ +@function dynamic-font-max($size, $maxScale, $unit: $baselineUnit) { + $baseScale: dynamic-font($size, $unit); + $maxScale: $size * $maxScale; + + @return min($baseScale, $maxScale); +} + +/** + * Convert a font size to a dynamic font size but impose + * a minimum font size. + * @param size - The initial font size including the unit (i.e. px or pt) + * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale). + * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to + * convert to a unit other than $baselineUnit. + */ +@function dynamic-font-min($minScale, $size, $unit: $baselineUnit) { + $baseScale: dynamic-font($size, $unit); + $minScale: $size * $minScale; + + @return max($minScale, $baseScale); +} + +/** + * Convert a font size to a dynamic font size but impose + * maximum and minimum font sizes. + * @param size - The initial font size including the unit (i.e. px or pt) + * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale). + * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale). + * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to + * convert to a unit other than $baselineUnit. + */ +@function dynamic-font-clamp($minScale, $baseSize, $maxScale, $unit: $baselineUnit) { + $baseScale: dynamic-font($baseSize, $unit); + $maxScale: $baseSize * $maxScale; + $minScale: $baseSize * $minScale; + + @return clamp($minScale, $baseScale, $maxScale); +} + +// Gets the active color's css variable from a variation. Alpha is optional. +// -------------------------------------------------------------------------------------------- +// Example usage: +// current-color(base) => var(--ion-color-base) +// current-color(contrast, 0.1) => rgba(var(--ion-color-contrast-rgb), 0.1) +// -------------------------------------------------------------------------------------------- +@function current-color($variation, $alpha: null) { + @if $alpha == null { + @return var(--ion-color-#{$variation}); + } @else { + @return rgba(var(--ion-color-#{$variation}-rgb), #{$alpha}); + } +} + +// Gets the specific color's css variable from the name and variation. Alpha/rgb are optional. +// -------------------------------------------------------------------------------------------- +// Example usage: +// ion-color(primary, base) => var(--ion-color-primary, #3880ff) +// ion-color(secondary, contrast) => var(--ion-color-secondary-contrast) +// ion-color(primary, base, 0.5) => rgba(var(--ion-color-primary-rgb, 56, 128, 255), 0.5) +// -------------------------------------------------------------------------------------------- +@function ion-color($name, $variation, $alpha: null, $rgb: null) { + $values: map.get($colors, $name); + $value: map.get($values, $variation); + $variable: --ion-color-#{$name}-#{$variation}; + + @if ($variation == base) { + $variable: --ion-color-#{$name}; + } + + @if ($alpha) { + $value: color-to-rgb-list($value); + @return rgba(var(#{$variable}-rgb, $value), $alpha); + } + @if ($rgb) { + $value: color-to-rgb-list($value); + $variable: #{$variable}-rgb; + } + + @return var(#{$variable}, $value); +} + +// Mixes a color with black to create its shade. +// -------------------------------------------------------------------------------------------- +@function get-color-shade($color) { + @return color.mix(#000, $color, 12%); +} + +// Mixes a color with white to create its tint. +// -------------------------------------------------------------------------------------------- +@function get-color-tint($color) { + @return color.mix(#fff, $color, 10%); +} + +// Converts a color to a comma separated rgb. +// -------------------------------------------------------------------------------------------- +@function color-to-rgb-list($color) { + @return #{color.red($color)},#{color.green($color)},#{color.blue($color)}; +} + +// String Utility Functions +// -------------------------------------------------------------------------------- + +// String Replace Function +// -------------------------------------------------------------------------------- + +@function str-replace($string, $search, $replace: "") { + $index: string.index($string, $search); + + @if $index { + @return string.slice($string, 1, $index - 1) + $replace + str-replace(string.slice($string, $index + string.length($search)), $search, $replace); + } + + @return $string; +} + +// String Split Function +// -------------------------------------------------------------------------------- + + +@function str-split($string, $separator) { + // empty array/list + $split-arr: (); + // first index of separator in string + $index: string.index($string, $separator); + // loop through string + @while $index != null { + // get the substring from the first character to the separator + $item: string.slice($string, 1, $index - 1); + // push item to array + $split-arr: list.append($split-arr, $item); + // remove item and separator from string + $string: string.slice($string, $index + 1); + // find new index of separator + $index: string.index($string, $separator); + } + // add the remaining string to list (the last item) + $split-arr: list.append($split-arr, $string); + + @return $split-arr; +} + + +// String Extract Function +// -------------------------------------------------------------------------------- + +@function str-extract($string, $start, $end) { + $start-index: string.index($string, $start); + + @if $start-index { + $post: string.slice($string, $start-index + string.length($start)); + $end-index: string.index($post, $end); + + @if $end-index { + @return string.slice($post, 1, $end-index - 1); + } + } + + @return null; +} + + +// String Contains Function +// -------------------------------------------------------------------------------- + +@function str-contains($string, $needle) { + @if (meta.type-of($string) == string) { + @return string.index($string, $needle) != null; + } + + @return false; +} + + +// URL Encode Function +// -------------------------------------------------------------------------------- + +@function url-encode($val) { + $spaces: str-replace($val, " ", "%20"); + $encoded: str-replace($spaces, "#", "%23"); + @return $encoded; +} + + +// Add Root Selector +// -------------------------------------------------------------------------------- +// Adds a root selector using host based on the selector passed +// $root: The selector that needs to be updated to include the $add-host-selector. +// - Example: ion-button +// $add-host-selector: The selector that is used to add the host to the $root selector. +// - Example: [dir=rtl] +// $use-host-context: Whether to use host-context or not. Defaults to true. +// -------------------------------------------------------------------------------- + + +@function add-root-selector($root, $add-host-selector, $use-host-context: true) { + $selectors: str-split($root, ","); + + $list: (); + + @each $selector in $selectors { + // If the selector contains :host( it means it is targeting a class on the host + // element so we need to change how we target it: + // Example with `use-host-context=true` + // @include add-root-selector(":host(.fixed)", "[dir=rtl]") + // --> :host-context([dir=rtl]):host(.fixed) + // --> :host-context([dir=rtl]).fixed + // --- + // Example with `use-host-context=false` + // @include add-root(":host(.fixed)", ":dir(rtl)", false) + // --> :host(.fixed:dir(rtl)) + @if str-contains($selector, ":host(") { + @if $use-host-context { + // @include add-root-selector(":host(.fixed)", "[dir=rtl]") + // --> :host-context([dir=rtl]):host(.fixed) + $shadow-element: str-replace($selector, ":host(", ":host-context(#{$add-host-selector}):host("); + $list: list.append($list, $shadow-element, comma); + } + + $new-element: (); + $elements: str-split($selector, " "); + + @each $element in $elements { + @if str-contains($element, ":host(") { + $scoped-element: $element; + + // Replace the :host( and ) so all we have left is the class + // inside of it: + // :host(.fixed) -> .fixed + $scoped-element: str-replace($scoped-element, ")", ""); + $scoped-element: str-replace($scoped-element, ":host(", ""); + + // Add the class back inside of host with the add-host-selector: + @if $use-host-context { + // .fixed -> :host-context([dir=rtl]).fixed + $scoped-element: str-replace($scoped-element, $scoped-element, ":host-context(#{$add-host-selector})#{$scoped-element}"); + } @else { + // .fixed -> :host(.fixed:dir(rtl)) + $scoped-element: str-replace($scoped-element, $scoped-element, ":host(#{$scoped-element}#{$add-host-selector})"); + } + + // @include add-root-selector(":host(.fixed)", "[dir=rtl]") + // --> :host-context([dir=rtl]).fixed + // @include add-root(":host(.fixed)", ":dir(rtl)", false) + // --> :host(.fixed:dir(rtl)) + $new-element: list.append($new-element, $scoped-element, space); + } @else { + // Add back any selectors that followed the host + // after transforming the first selector: + // @include add-root-selector(":host(.fixed) ::slotted(ion-icon)", "[dir=rtl]") + // --> :host-context([dir=rtl]):host(.fixed) ::slotted(ion-icon) + // --> :host-context([dir=rtl]).fixed ::slotted(ion-icon) + // @include add-root(":host(.fixed) ::slotted(ion-icon)", ":dir(rtl)", false) + // --> :host(.fixed:dir(rtl)) ::slotted(ion-icon) + $new-element: list.append($new-element, $element, space); + } + } + + $list: list.append($list, $new-element, comma); + // If the selector contains :host without a parantheses + // it means it is targeting just the host + // element so we can change it to look for host-context + // @include add-root-selector(":host", "[dir=rtl]") + // --> :host-context([dir=rtl]) + // @include add-root(":host", ":dir(rtl)", false) + // --> :host(:dir(rtl)) + } @else if str-contains($selector, ":host") { + $new-element: (); + $elements: str-split($selector, " "); + + @each $element in $elements { + @if str-contains($element, ":host") { + $updated-element: ''; + + // Replace the :host with the add-host-selector: + @if $use-host-context { + // :host -> :host-context([dir=rtl]) + $updated-element: str-replace($element, ":host", ":host-context(#{$add-host-selector})"); + } @else { + // :host -> :host(:dir(rtl)) + $updated-element: str-replace($element, ":host", ":host(#{$add-host-selector})"); + } + + // Add the final selector after all transformations: + // @include add-root-selector(":host", "[dir=rtl]") + // --> :host-context([dir=rtl]) + // @include add-root(":host", ":dir(rtl)", false) + // --> :host(:dir(rtl)) + $new-element: list.append($new-element, $updated-element, space); + } @else { + // Add back any selectors that followed the host + // after transforming the first selector: + // @include add-root-selector(":host ::slotted(ion-icon)", "[dir=rtl]") + // --> :host-context([dir=rtl]) ::slotted(ion-icon) + // @include add-root(":host ::slotted(ion-icon)", ":dir(rtl)", false) + // --> :host(:dir(rtl)) ::slotted(ion-icon) + $new-element: list.append($new-element, $element, space); + } + } + + $list: list.append($list, $new-element, comma); + // If the selector does not contain host at all it is either a shadow + // or normal element so append both the add-host-selector and host-context + // @include add-root-selector("ion-component", "[dir=rtl]") + // --> :host-context([dir=rtl]) ion-component + // --> [dir=rtl] ion-component + // @include add-root("ion-component", ":dir(rtl)", false) + // --> ion-component:dir(rtl) + } @else { + @if ($use-host-context) { + $list: list.append($list, ":host-context(#{$add-host-selector}) #{$selector}", comma); + $list: list.append($list, "#{$add-host-selector} #{$selector}", comma); + } @else { + $list: list.append($list, "#{$selector}#{$add-host-selector}", comma); + } + } + } + + @return $list; +} diff --git a/core/src/themes/globals.ionic.scss b/core/src/themes/globals.ionic.scss new file mode 100644 index 0000000000..ddf316bc2a --- /dev/null +++ b/core/src/themes/globals.ionic.scss @@ -0,0 +1,6 @@ + +// Global Core +@import "./globals"; + +// Global Ionic +@import "./default.ionic"; diff --git a/core/src/themes/globals.ios.scss b/core/src/themes/globals.ios.scss new file mode 100644 index 0000000000..43e231db4c --- /dev/null +++ b/core/src/themes/globals.ios.scss @@ -0,0 +1,6 @@ + +// Global Core +@import "./globals"; + +// Global iOS +@import "./default.ios"; diff --git a/core/src/themes/globals.md.scss b/core/src/themes/globals.md.scss new file mode 100644 index 0000000000..7b2da89744 --- /dev/null +++ b/core/src/themes/globals.md.scss @@ -0,0 +1,6 @@ + +// Global Core +@import "./globals"; + +// Global Material Design +@import "./default.md"; diff --git a/core/src/themes/ionic.globals.scss b/core/src/themes/globals.scss similarity index 84% rename from core/src/themes/ionic.globals.scss rename to core/src/themes/globals.scss index 0d4f8769b5..2efd1066bb 100644 --- a/core/src/themes/ionic.globals.scss +++ b/core/src/themes/globals.scss @@ -1,19 +1,12 @@ -// Global Utility Functions -@import "./ionic.functions.sizes"; -@import "./ionic.functions.string"; - -// Global Color Functions -@import "./ionic.functions.color"; - -// Global Font Functions -@import "./ionic.functions.font"; +// Global Functions +@import "./functions"; // Global Mixins -@import "./ionic.mixins"; +@import "./mixins"; // Default Theme -@import "./ionic.theme.default"; +@import "./default"; // Default General diff --git a/core/src/themes/ionic.functions.color.scss b/core/src/themes/ionic.functions.color.scss deleted file mode 100644 index 1d78bbe131..0000000000 --- a/core/src/themes/ionic.functions.color.scss +++ /dev/null @@ -1,59 +0,0 @@ -// Gets the active color's css variable from a variation. Alpha is optional. -// -------------------------------------------------------------------------------------------- -// Example usage: -// current-color(base) => var(--ion-color-base) -// current-color(contrast, 0.1) => rgba(var(--ion-color-contrast-rgb), 0.1) -// -------------------------------------------------------------------------------------------- -@function current-color($variation, $alpha: null) { - @if $alpha == null { - @return var(--ion-color-#{$variation}); - } @else { - @return rgba(var(--ion-color-#{$variation}-rgb), #{$alpha}); - } -} - -// Gets the specific color's css variable from the name and variation. Alpha/rgb are optional. -// -------------------------------------------------------------------------------------------- -// Example usage: -// ion-color(primary, base) => var(--ion-color-primary, #3880ff) -// ion-color(secondary, contrast) => var(--ion-color-secondary-contrast) -// ion-color(primary, base, 0.5) => rgba(var(--ion-color-primary-rgb, 56, 128, 255), 0.5) -// -------------------------------------------------------------------------------------------- -@function ion-color($name, $variation, $alpha: null, $rgb: null) { - $values: map-get($colors, $name); - $value: map-get($values, $variation); - $variable: --ion-color-#{$name}-#{$variation}; - - @if ($variation == base) { - $variable: --ion-color-#{$name}; - } - - @if ($alpha) { - $value: color-to-rgb-list($value); - @return rgba(var(#{$variable}-rgb, $value), $alpha); - } - @if ($rgb) { - $value: color-to-rgb-list($value); - $variable: #{$variable}-rgb; - } - - @return var(#{$variable}, $value); -} - -// Mixes a color with black to create its shade. -// -------------------------------------------------------------------------------------------- -@function get-color-shade($color) { - @return mix(#000, $color, 12%); -} - -// Mixes a color with white to create its tint. -// -------------------------------------------------------------------------------------------- -@function get-color-tint($color) { - @return mix(#fff, $color, 10%); -} - -// Converts a color to a comma separated rgb. -// -------------------------------------------------------------------------------------------- -@function color-to-rgb-list($color) { - @return #{red($color)},#{green($color)},#{blue($color)}; -} diff --git a/core/src/themes/ionic.functions.font.scss b/core/src/themes/ionic.functions.font.scss deleted file mode 100644 index 81adff90e7..0000000000 --- a/core/src/themes/ionic.functions.font.scss +++ /dev/null @@ -1,63 +0,0 @@ -@use "sass:math"; - -$baselineSize: 16px !default; -$baselineUnit: 1rem !default; - -/** - * Convert a font size to a dynamic font size. - * Fonts that participate in Dynamic Type should use - * dynamic font sizes. - * @param size - The initial font size including the unit (i.e. px or pt) - * @param unit (optional) - The unit to convert to. Use this if you want to - * convert to a unit other than $baselineUnit. - */ -@function dynamic-font($size, $unit: $baselineUnit) { - @return (math.div($size, $baselineSize)) * $unit; -} - -/** - * Convert a font size to a dynamic font size but impose - * a maximum font size. - * @param size - The initial font size including the unit (i.e. px or pt) - * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale). - * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to - * convert to a unit other than $baselineUnit. - */ -@function dynamic-font-max($size, $maxScale, $unit: $baselineUnit) { - $baseScale: dynamic-font($size, $unit); - $maxScale: $size * $maxScale; - - @return min($baseScale, $maxScale); -} - -/** - * Convert a font size to a dynamic font size but impose - * a minimum font size. - * @param size - The initial font size including the unit (i.e. px or pt) - * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale). - * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to - * convert to a unit other than $baselineUnit. - */ -@function dynamic-font-min($minScale, $size, $unit: $baselineUnit) { - $baseScale: dynamic-font($size, $unit); - $minScale: $size * $minScale; - - @return max($minScale, $baseScale); -} - -/** - * Convert a font size to a dynamic font size but impose - * maximum and minimum font sizes. - * @param size - The initial font size including the unit (i.e. px or pt) - * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale). - * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale). - * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to - * convert to a unit other than $baselineUnit. - */ -@function dynamic-font-clamp($minScale, $baseSize, $maxScale, $unit: $baselineUnit) { - $baseScale: dynamic-font($baseSize, $unit); - $maxScale: $baseSize * $maxScale; - $minScale: $baseSize * $minScale; - - @return clamp($minScale, $baseScale, $maxScale); -} diff --git a/core/src/themes/ionic.functions.sizes.scss b/core/src/themes/ionic.functions.sizes.scss deleted file mode 100644 index f8adbc29eb..0000000000 --- a/core/src/themes/ionic.functions.sizes.scss +++ /dev/null @@ -1,13 +0,0 @@ -@use "sass:math"; - -$browser-context: 16; - -/** - * Convert a pixels given value into rem - * - * @param pixels - Value in pixels to be converted (i.e. px) - * @param context (optional) - Baseline value - */ -@function px-to-rem($pixels, $context: $browser-context) { - @return math.div($pixels, $context) * 1rem; -} diff --git a/core/src/themes/ionic.functions.string.scss b/core/src/themes/ionic.functions.string.scss deleted file mode 100644 index ea3da90c5e..0000000000 --- a/core/src/themes/ionic.functions.string.scss +++ /dev/null @@ -1,220 +0,0 @@ -// String Utility Functions -// -------------------------------------------------------------------------------- - -// String Replace Function -// -------------------------------------------------------------------------------- - -@function str-replace($string, $search, $replace: "") { - $index: str-index($string, $search); - - @if $index { - @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace); - } - - @return $string; -} - -// String Split Function -// -------------------------------------------------------------------------------- - - -@function str-split($string, $separator) { - // empty array/list - $split-arr: (); - // first index of separator in string - $index: str-index($string, $separator); - // loop through string - @while $index != null { - // get the substring from the first character to the separator - $item: str-slice($string, 1, $index - 1); - // push item to array - $split-arr: append($split-arr, $item); - // remove item and separator from string - $string: str-slice($string, $index + 1); - // find new index of separator - $index: str-index($string, $separator); - } - // add the remaining string to list (the last item) - $split-arr: append($split-arr, $string); - - @return $split-arr; -} - - -// String Extract Function -// -------------------------------------------------------------------------------- - -@function str-extract($string, $start, $end) { - $start-index: str-index($string, $start); - - @if $start-index { - $post: str-slice($string, $start-index + str-length($start)); - $end-index: str-index($post, $end); - - @if $end-index { - @return str-slice($post, 1, $end-index - 1); - } - } - - @return null; -} - - -// String Contains Function -// -------------------------------------------------------------------------------- - -@function str-contains($string, $needle) { - @if (type-of($string) == string) { - @return str-index($string, $needle) != null; - } - - @return false; -} - - -// URL Encode Function -// -------------------------------------------------------------------------------- - -@function url-encode($val) { - $spaces: str-replace($val, " ", "%20"); - $encoded: str-replace($spaces, "#", "%23"); - @return $encoded; -} - - -// Add Root Selector -// -------------------------------------------------------------------------------- -// Adds a root selector using host based on the selector passed -// $root: The selector that needs to be updated to include the $addHostSelector. -// - Example: ion-button -// $addHostSelector: The selector that is used to add the host to the $root selector. -// - Example: [dir=rtl] -// $useHostContext: Whether to use host-context or not. Defaults to true. -// -------------------------------------------------------------------------------- - - -@function add-root-selector($root, $addHostSelector, $useHostContext: true) { - $selectors: str-split($root, ","); - - $list: (); - - @each $selector in $selectors { - // If the selector contains :host( it means it is targeting a class on the host - // element so we need to change how we target it: - // Example with `useHostContext=true` - // @include add-root-selector(":host(.fixed)", "[dir=rtl]") - // --> :host-context([dir=rtl]):host(.fixed) - // --> :host-context([dir=rtl]).fixed - // --- - // Example with `useHostContext=false` - // @include add-root(":host(.fixed)", ":dir(rtl)", false) - // --> :host(.fixed:dir(rtl)) - @if str-contains($selector, ":host(") { - @if $useHostContext { - // @include add-root-selector(":host(.fixed)", "[dir=rtl]") - // --> :host-context([dir=rtl]):host(.fixed) - $shadow-element: str-replace($selector, ":host(", ":host-context(#{$addHostSelector}):host("); - $list: append($list, $shadow-element, comma); - } - - $new-element: (); - $elements: str-split($selector, " "); - - @each $element in $elements { - @if str-contains($element, ":host(") { - $scoped-element: $element; - - // Replace the :host( and ) so all we have left is the class - // inside of it: - // :host(.fixed) -> .fixed - $scoped-element: str-replace($scoped-element, ")", ""); - $scoped-element: str-replace($scoped-element, ":host(", ""); - - // Add the class back inside of host with the addHostSelector: - @if $useHostContext { - // .fixed -> :host-context([dir=rtl]).fixed - $scoped-element: str-replace($scoped-element, $scoped-element, ":host-context(#{$addHostSelector})#{$scoped-element}"); - } @else { - // .fixed -> :host(.fixed:dir(rtl)) - $scoped-element: str-replace($scoped-element, $scoped-element, ":host(#{$scoped-element}#{$addHostSelector})"); - } - - // @include add-root-selector(":host(.fixed)", "[dir=rtl]") - // --> :host-context([dir=rtl]).fixed - // @include add-root(":host(.fixed)", ":dir(rtl)", false) - // --> :host(.fixed:dir(rtl)) - $new-element: append($new-element, $scoped-element, space); - } @else { - // Add back any selectors that followed the host - // after transforming the first selector: - // @include add-root-selector(":host(.fixed) ::slotted(ion-icon)", "[dir=rtl]") - // --> :host-context([dir=rtl]):host(.fixed) ::slotted(ion-icon) - // --> :host-context([dir=rtl]).fixed ::slotted(ion-icon) - // @include add-root(":host(.fixed) ::slotted(ion-icon)", ":dir(rtl)", false) - // --> :host(.fixed:dir(rtl)) ::slotted(ion-icon) - $new-element: append($new-element, $element, space); - } - } - - $list: append($list, $new-element, comma); - // If the selector contains :host without a parantheses - // it means it is targeting just the host - // element so we can change it to look for host-context - // @include add-root-selector(":host", "[dir=rtl]") - // --> :host-context([dir=rtl]) - // @include add-root(":host", ":dir(rtl)", false) - // --> :host(:dir(rtl)) - } @else if str-contains($selector, ":host") { - $new-element: (); - $elements: str-split($selector, " "); - - @each $element in $elements { - @if str-contains($element, ":host") { - $updated-element: ''; - - // Replace the :host with the addHostSelector: - @if $useHostContext { - // :host -> :host-context([dir=rtl]) - $updated-element: str-replace($element, ":host", ":host-context(#{$addHostSelector})"); - } @else { - // :host -> :host(:dir(rtl)) - $updated-element: str-replace($element, ":host", ":host(#{$addHostSelector})"); - } - - // Add the final selector after all transformations: - // @include add-root-selector(":host", "[dir=rtl]") - // --> :host-context([dir=rtl]) - // @include add-root(":host", ":dir(rtl)", false) - // --> :host(:dir(rtl)) - $new-element: append($new-element, $updated-element, space); - } @else { - // Add back any selectors that followed the host - // after transforming the first selector: - // @include add-root-selector(":host ::slotted(ion-icon)", "[dir=rtl]") - // --> :host-context([dir=rtl]) ::slotted(ion-icon) - // @include add-root(":host ::slotted(ion-icon)", ":dir(rtl)", false) - // --> :host(:dir(rtl)) ::slotted(ion-icon) - $new-element: append($new-element, $element, space); - } - } - - $list: append($list, $new-element, comma); - // If the selector does not contain host at all it is either a shadow - // or normal element so append both the addHostSelector and host-context - // @include add-root-selector("ion-component", "[dir=rtl]") - // --> :host-context([dir=rtl]) ion-component - // --> [dir=rtl] ion-component - // @include add-root("ion-component", ":dir(rtl)", false) - // --> ion-component:dir(rtl) - } @else { - @if ($useHostContext) { - $list: append($list, ":host-context(#{$addHostSelector}) #{$selector}", comma); - $list: append($list, "#{$addHostSelector} #{$selector}", comma); - } @else { - $list: append($list, "#{$selector}#{$addHostSelector}", comma); - } - } - } - - @return $list; -} diff --git a/core/src/themes/ionic.globals.ios.scss b/core/src/themes/ionic.globals.ios.scss deleted file mode 100644 index d9aca20c4f..0000000000 --- a/core/src/themes/ionic.globals.ios.scss +++ /dev/null @@ -1,6 +0,0 @@ - -// Global Core -@import "./ionic.globals"; - -// Global iOS -@import "./ionic.theme.default.ios"; diff --git a/core/src/themes/ionic.globals.md.scss b/core/src/themes/ionic.globals.md.scss deleted file mode 100644 index 6c0d558d01..0000000000 --- a/core/src/themes/ionic.globals.md.scss +++ /dev/null @@ -1,6 +0,0 @@ - -// Core Globals -@import "./ionic.globals"; - -// Material Design Globals -@import "./ionic.theme.default.md"; diff --git a/core/src/themes/ionic.mixins.scss b/core/src/themes/mixins.scss similarity index 100% rename from core/src/themes/ionic.mixins.scss rename to core/src/themes/mixins.scss diff --git a/core/src/utils/forms/notch-controller.ts b/core/src/utils/forms/notch-controller.ts index af8f8dccf9..1a10ddb02f 100644 --- a/core/src/utils/forms/notch-controller.ts +++ b/core/src/utils/forms/notch-controller.ts @@ -153,7 +153,7 @@ export const createNotchController = ( * The notch is only visible when the label is scaled, * which is why we multiply the width by 0.75 as this is * the same amount the label element is scaled by in the host CSS. - * (See $form-control-label-stacked-scale in ionic.globals.scss). + * (See $form-control-label-stacked-scale in globals.scss). */ notchSpacerEl.style.setProperty('width', `${width * 0.75}px`); };