From 42c37514543e501e9b50160e8275ff850dc7eccf Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sat, 11 Feb 2023 22:46:11 +0100 Subject: [PATCH 1/2] fix: Button remove `color-primary-element-lighter` and use default styling Default style is `secondary` so we can simply remove the old styling and set it to the same as secondary. Signed-off-by: Ferdinand Thiessen --- src/components/NcButton/NcButton.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/NcButton/NcButton.vue b/src/components/NcButton/NcButton.vue index 7104b7b6f5..58d8898a54 100644 --- a/src/components/NcButton/NcButton.vue +++ b/src/components/NcButton/NcButton.vue @@ -412,8 +412,8 @@ export default { } // Default button type - background-color: var(--color-primary-element-lighter), var(--color-primary-element-light); color: var(--color-primary-light-text); + background-color: var(--color-primary-light); &:hover:not(:disabled) { background-color: var(--color-primary-light-hover); } @@ -421,7 +421,7 @@ export default { // Back to the default color for this button when active // TODO: add ripple effect &:active { - background-color: var(--color-primary-element-lighter), var(--color-primary-element-light); + background-color: var(--color-primary-element-light); } &__wrapper { From 553d94f8d70b15297e7b47241ee117d59b24fe3a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sat, 11 Feb 2023 22:47:56 +0100 Subject: [PATCH 2/2] fix: CounterBubble remove `color-primary-element-lighter` Unify styling for all versions Signed-off-by: Ferdinand Thiessen --- src/components/NcCounterBubble/NcCounterBubble.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/NcCounterBubble/NcCounterBubble.vue b/src/components/NcCounterBubble/NcCounterBubble.vue index 3208daf375..550d33d764 100644 --- a/src/components/NcCounterBubble/NcCounterBubble.vue +++ b/src/components/NcCounterBubble/NcCounterBubble.vue @@ -87,8 +87,7 @@ export default { line-height: 1em; padding: 4px 6px; border-radius: var(--border-radius-pill); - // since -lighter is not present in the new version it will only apply to the old one and -light for the newer - background-color: var(--color-primary-element-lighter, var(--color-primary-element-light)); + background-color: var(--color-primary-element-light); font-weight: bold; color: var(--color-primary-element);