From 3deec15e165fd77646c2776f1de1407d817c336c Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 22 Jun 2023 16:54:15 -0400 Subject: [PATCH] chore: rename badge namespaces --- core/src/components/badge/badge.ios.scss | 6 +++--- core/src/components/badge/badge.md.scss | 6 +++--- core/src/components/badge/badge.scss | 21 ++++++++++--------- .../themes-migrated/ionic.globals.ios.scss | 4 ++-- .../src/themes-migrated/ionic.globals.md.scss | 4 ++-- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/core/src/components/badge/badge.ios.scss b/core/src/components/badge/badge.ios.scss index 66efc75d7b..112b0e362a 100644 --- a/core/src/components/badge/badge.ios.scss +++ b/core/src/components/badge/badge.ios.scss @@ -1,9 +1,9 @@ -@use "badge" as badge2; -@use "badge.ios.vars"; +@use "badge"; +@use "badge.ios.vars" as iosVars; // iOS Badge // -------------------------------------------------- :host { - @include border-radius(badge.$badge-ios-border-radius); + @include border-radius(iosVars.$badge-ios-border-radius); } diff --git a/core/src/components/badge/badge.md.scss b/core/src/components/badge/badge.md.scss index 37f2fd010e..7267121a95 100644 --- a/core/src/components/badge/badge.md.scss +++ b/core/src/components/badge/badge.md.scss @@ -1,5 +1,5 @@ -@use "badge" as badge2; -@use "badge.md.vars"; +@use "badge"; +@use "badge.md.vars" as mdVars; // Material Design Badge // -------------------------------------------------- @@ -10,5 +10,5 @@ --padding-bottom: 4px; --padding-start: 4px; - @include border-radius(badge.$badge-md-border-radius); + @include border-radius(mdVars.$badge-md-border-radius); } diff --git a/core/src/components/badge/badge.scss b/core/src/components/badge/badge.scss index 5ecc908f7b..b18dae742a 100644 --- a/core/src/components/badge/badge.scss +++ b/core/src/components/badge/badge.scss @@ -1,5 +1,6 @@ -@use "badge.vars"; -@use "../../themes-migrated/ionic.globals"; +@use "badge.vars" as vars; + +@use "../../themes-migrated/ionic.globals" as globals; // Badge // -------------------------------------------------- @@ -16,24 +17,24 @@ */ --background: #{ion-color(primary, base)}; --color: #{ion-color(primary, contrast)}; - --padding-top: #{badge.$badge-padding-top}; - --padding-end: #{badge.$badge-padding-end}; - --padding-bottom: #{badge.$badge-padding-bottom}; - --padding-start: #{badge.$badge-padding-start}; + --padding-top: #{vars.$badge-padding-top}; + --padding-end: #{vars.$badge-padding-end}; + --padding-bottom: #{vars.$badge-padding-bottom}; + --padding-start: #{vars.$badge-padding-start}; @include font-smoothing(); @include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start)); display: inline-block; - min-width: badge.$badge-min-width; + min-width: vars.$badge-min-width; background: var(--background); color: var(--color); - font-family: ionic.$font-family-base; - font-size: badge.$badge-font-size; - font-weight: badge.$badge-font-weight; + font-family: globals.$font-family-base; + font-size: vars.$badge-font-size; + font-weight: vars.$badge-font-weight; line-height: 1; diff --git a/core/src/themes-migrated/ionic.globals.ios.scss b/core/src/themes-migrated/ionic.globals.ios.scss index bcca797490..f9f06b02f5 100644 --- a/core/src/themes-migrated/ionic.globals.ios.scss +++ b/core/src/themes-migrated/ionic.globals.ios.scss @@ -1,6 +1,6 @@ // Global Core -@use "ionic.globals"; +@use "ionic.globals" as globals; // Global iOS -@use "ionic.theme.default.ios" as ionic2; +@use "ionic.theme.default.ios" as iosDefaultTheme; diff --git a/core/src/themes-migrated/ionic.globals.md.scss b/core/src/themes-migrated/ionic.globals.md.scss index 1b992d5eba..c691904cd5 100644 --- a/core/src/themes-migrated/ionic.globals.md.scss +++ b/core/src/themes-migrated/ionic.globals.md.scss @@ -1,6 +1,6 @@ // Core Globals -@use "ionic.globals"; +@use "ionic.globals" as globals; // Material Design Globals -@use "ionic.theme.default.md" as ionic2; +@use "ionic.theme.default.md" as mdDefaultTheme;