From 54c5993ddeabd41b9d28fd7bec374b7eae67eb37 Mon Sep 17 00:00:00 2001 From: BenOsodrac Date: Tue, 29 Apr 2025 12:59:51 +0100 Subject: [PATCH 1/8] fix link styles --- core/src/css/ionic/link.ionic.scss | 72 ++++++++++++------------------ 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/core/src/css/ionic/link.ionic.scss b/core/src/css/ionic/link.ionic.scss index 8862faf083f..e2cd4193178 100644 --- a/core/src/css/ionic/link.ionic.scss +++ b/core/src/css/ionic/link.ionic.scss @@ -25,46 +25,49 @@ &:visited { color: globals.$ion-text-link-visited; } -} -// Link: Standalone -// ------------------------------------------------------------------------------- + // Link: Focus + // ------------------------------------------------------------------------------- -@mixin ionic-link { - color: globals.$ion-text-link-default; + &:focus, + &.ion-focused { + @include globals.focused-state(); - text-decoration: none; + border-radius: globals.$ion-border-radius-100; + } - @include link-shared; + // Link: Active + // ------------------------------------------------------------------------------- + + &:active, + &.ion-activated { + color: globals.$ion-text-link-press; - // Link: Standalone - Hover + text-decoration: underline; + } + + // Link: Hover // ------------------------------------------------------------------------------- @media (any-hover: hover) { &:hover { + color: globals.$ion-text-link-press; + text-decoration: underline; } } - // Link: Standalone - Focus - // ------------------------------------------------------------------------------- - - &:focus, - &.ion-focused { - @include globals.focused-state(null, null, globals.$ion-text-link-default); +} - text-decoration: underline; - } +// Link: Standalone +// ------------------------------------------------------------------------------- - // Link: Standalone - Active - // ------------------------------------------------------------------------------- +@mixin ionic-link { + color: globals.$ion-text-link-default; - &:active, - &.ion-activated { - color: globals.$ion-text-link-press; + text-decoration: none; - text-decoration: underline; - } + @include link-shared; } a.ionic-link, @@ -76,38 +79,21 @@ a.ionic-link, // ------------------------------------------------------------------------------- @mixin ionic-link-underline { - color: currentColor; + color: globals.$ion-text-default; text-decoration: underline; @include link-shared; - // Link: Underline - Hover - // ------------------------------------------------------------------------------- - - @media (any-hover: hover) { - &:hover { - color: globals.$ion-text-link-press; - } - } - - // Link: Underline - Focus + // Link: Focus // ------------------------------------------------------------------------------- &:focus, &.ion-focused { - @include globals.focused-state(null, null, globals.$ion-text-link-default); + color: globals.$ion-text-default; text-decoration: none; } - - // Link: Underline - Active - // ------------------------------------------------------------------------------- - - &:active, - &.ion-activated { - color: globals.$ion-text-link-press; - } } a.ionic-link-underline, From ab284672b42e9cc3e44ac0a76ae0b4c954f1f5c5 Mon Sep 17 00:00:00 2001 From: BenOsodrac Date: Tue, 29 Apr 2025 13:12:26 +0100 Subject: [PATCH 2/8] adjust class names and tests --- core/src/css/ionic/link.ionic.scss | 8 +++---- core/src/css/test/link/basic/index.html | 32 ++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/src/css/ionic/link.ionic.scss b/core/src/css/ionic/link.ionic.scss index e2cd4193178..8ba118fcd86 100644 --- a/core/src/css/ionic/link.ionic.scss +++ b/core/src/css/ionic/link.ionic.scss @@ -70,8 +70,8 @@ @include link-shared; } -a.ionic-link, -:not(a).ionic-link a { +a, +:not(a).ion-link a { @include ionic-link; } @@ -96,7 +96,7 @@ a.ionic-link, } } -a.ionic-link-underline, -:not(a).ionic-link-underline a { +a.ion-link-underline, +:not(a).ion-link-underline a { @include ionic-link-underline; } diff --git a/core/src/css/test/link/basic/index.html b/core/src/css/test/link/basic/index.html index 695e9c97fcc..4a8dd9bde26 100644 --- a/core/src/css/test/link/basic/index.html +++ b/core/src/css/test/link/basic/index.html @@ -28,45 +28,45 @@ -

Standalone (.ionic-link)

+

Standalone (.ion-link)

-

Underline (.ionic-link-underline)

+

Underline (.ion-link-underline)

Links in Content

Parent Element