From cff27d972c09011448f70fb225d1b04d817984c8 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 27 Jul 2021 17:33:59 -0400 Subject: [PATCH] feat: remove color-link LESS variable and scope the CSS variable --- resources/skins.citizen.styles/common/common.less | 6 +++--- resources/skins.citizen.styles/common/cssvariables.less | 6 ------ resources/skins.citizen.styles/common/theme.less | 6 ++++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/skins.citizen.styles/common/common.less b/resources/skins.citizen.styles/common/common.less index 598ccf9a..ad310745 100644 --- a/resources/skins.citizen.styles/common/common.less +++ b/resources/skins.citizen.styles/common/common.less @@ -236,14 +236,14 @@ video { // Have to hardcode the color since the filter breaks the color a { - color: @color-link; + color: @color-primary; &:hover { - color: @color-link--hover; + color: @color-primary--hover; } &:active { - color: @color-link--active; + color: @color-primary--active; } } } diff --git a/resources/skins.citizen.styles/common/cssvariables.less b/resources/skins.citizen.styles/common/cssvariables.less index 2a044161..4cc678d7 100644 --- a/resources/skins.citizen.styles/common/cssvariables.less +++ b/resources/skins.citizen.styles/common/cssvariables.less @@ -50,9 +50,6 @@ --color-warning: @color-warning; --color-success: @color-success; - --color-link: @color-link; - --color-link--hover: @color-link--hover; - --color-link--active: @color-link--active; --color-link-new: @color-link-new; --color-link-new--hover: @color-link-new--hover; --color-link-new--active: @color-link-new--active; @@ -135,9 +132,6 @@ html { --color-base--emphasized: @dark-color-base--emphasized; --color-base--subtle: @dark-color-base--subtle; - --color-link: @dark-color-link; - --color-link--hover: @dark-color-link--hover; - --color-link--active: @dark-color-link--active; --color-link-new: @dark-color-link-new; --color-link-new--hover: @dark-color-link-new--hover; --color-link-new--active: @dark-color-link-new--active; diff --git a/resources/skins.citizen.styles/common/theme.less b/resources/skins.citizen.styles/common/theme.less index 5df994fc..21e8a773 100644 --- a/resources/skins.citizen.styles/common/theme.less +++ b/resources/skins.citizen.styles/common/theme.less @@ -24,6 +24,12 @@ --color-surface-2--active: @color-surface-2--active; } +a { + --color-link: ~'var( --color-primary )'; + --color-link--hover: ~'var( --color-primary--hover )'; + --color-link--active: ~'var( --color-primary--active )'; +} + /** * Dark theme */