diff --git a/core/src/components/badge/badge.ios.scss b/core/src/components/badge/badge.ios.scss index 68183d96fb..7d6f034318 100644 --- a/core/src/components/badge/badge.ios.scss +++ b/core/src/components/badge/badge.ios.scss @@ -1,5 +1,7 @@ -@import "./badge"; -@import "./badge.ios.vars"; +@use "./badge.vars" as *; +@use "./badge" as *; +@use "./badge.ios.vars" as *; +@use "../../migrated-themes/globals.ios" as *; // iOS Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.ios.vars.scss b/core/src/components/badge/badge.ios.vars.scss index 8723a96e0a..21b23c1430 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/globals.ios"; +@use "../../migrated-themes/globals.ios" as *; // iOS Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.md.scss b/core/src/components/badge/badge.md.scss index d1038913dc..8eb076247b 100644 --- a/core/src/components/badge/badge.md.scss +++ b/core/src/components/badge/badge.md.scss @@ -1,5 +1,6 @@ -@import "./badge"; -@import "./badge.md.vars"; +@use "./badge" as *; +@use "./badge.md.vars" as *; +@use "../../migrated-themes/globals.md" as *; // Material Design Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.md.vars.scss b/core/src/components/badge/badge.md.vars.scss index 06ca5c8d2a..1e6ba7c193 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/globals.md"; +@use "../../migrated-themes/globals.md" as *; // Material Design Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.scss b/core/src/components/badge/badge.scss index 22252d5523..02164155ea 100644 --- a/core/src/components/badge/badge.scss +++ b/core/src/components/badge/badge.scss @@ -1,4 +1,5 @@ -@import "./badge.vars"; +@use "./badge.vars" as *; +@use "../../migrated-themes/globals" as *; // Badge // -------------------------------------------------- diff --git a/core/src/components/badge/badge.vars.scss b/core/src/components/badge/badge.vars.scss index 439066b106..73711986c4 100644 --- a/core/src/components/badge/badge.vars.scss +++ b/core/src/components/badge/badge.vars.scss @@ -1,4 +1,4 @@ -@import "../../themes/globals"; +@use "../../migrated-themes/globals" as *; // Badge // -------------------------------------------------- diff --git a/core/src/migrated-themes/default.ionic.scss b/core/src/migrated-themes/default.ionic.scss index 7c0b6850d8..1cc12efd41 100644 --- a/core/src/migrated-themes/default.ionic.scss +++ b/core/src/migrated-themes/default.ionic.scss @@ -1,3 +1,5 @@ +@use "./default" as *; + // Ionic Theme // ------------------------------------------------------------------------------------------- // This file should only contain variables that are diff --git a/core/src/migrated-themes/default.ios.scss b/core/src/migrated-themes/default.ios.scss index d282c03ea5..d81bff04c7 100644 --- a/core/src/migrated-themes/default.ios.scss +++ b/core/src/migrated-themes/default.ios.scss @@ -1,3 +1,5 @@ +@use "./default" as *; + // Ionic iOS Theme // ------------------------------------------------------------------------------------------- // This file should only contain variables that are diff --git a/core/src/migrated-themes/default.md.scss b/core/src/migrated-themes/default.md.scss index 0e3c2d8289..8765dd8a5e 100644 --- a/core/src/migrated-themes/default.md.scss +++ b/core/src/migrated-themes/default.md.scss @@ -1,3 +1,4 @@ +@use "./default" as *; // Material Design Default Theme // -------------------------------------------------- diff --git a/core/src/migrated-themes/functions.scss b/core/src/migrated-themes/functions.scss index d7c3a24f8c..5799d852d1 100644 --- a/core/src/migrated-themes/functions.scss +++ b/core/src/migrated-themes/functions.scss @@ -6,6 +6,8 @@ @use "sass:meta"; @use "sass:string"; +@use "./default" as *; + // TODO can we combine the following two variables // and combine the functions that use them? $browser-context: 16;