From b88cf730d37fc6f114ec0b74218dca057be5e729 Mon Sep 17 00:00:00 2001 From: David Newell Date: Fri, 17 Nov 2023 16:44:15 +0000 Subject: [PATCH 1/3] fix: icon default color --- frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss index d7a53bb238fbb..0ee3951cae88c 100644 --- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss +++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss @@ -36,7 +36,7 @@ padding: 0.25rem 0.75rem; width: 100%; - .LemonButton__icon:first-child { + .LemonButton__icon { transition: var(--transition); color: var(--default); opacity: 0.5; From 00520a46e0f755a3e7ed4596ec3d763bfa9d31c5 Mon Sep 17 00:00:00 2001 From: David Newell Date: Fri, 17 Nov 2023 16:51:29 +0000 Subject: [PATCH 2/3] move styles to legacy --- frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss | 6 ------ frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss | 2 -- .../src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss | 6 ++++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss index 5ce621e0bb385..a577561d50dff 100644 --- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss +++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss @@ -136,12 +136,6 @@ @each $status in ('primary', 'danger', 'primary-alt', 'muted') { &.LemonButton--status-#{$status} { - color: var(--#{$status}-3000, var(--#{$status}, var(--primary))); - - .LemonButton__icon { - color: var(--#{$status}-3000, var(--#{$status})); - } - // Primary - blocked color style &.LemonButton--primary { color: #fff; diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss index 0ee3951cae88c..a5998369e1e99 100644 --- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss +++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss @@ -37,8 +37,6 @@ width: 100%; .LemonButton__icon { - transition: var(--transition); - color: var(--default); opacity: 0.5; } } diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss index fc10519414fee..33de7e17b8d53 100644 --- a/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss +++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss @@ -124,6 +124,12 @@ body:not(.posthog-3000) { background: var(--#{$status}-highlight, var(--primary-highlight)); } + color: var(--#{$status}-3000, var(--#{$status}, var(--primary))); + + .LemonButton__icon { + color: var(--#{$status}-3000, var(--#{$status})); + } + &:not([aria-disabled='true']):active { color: var(--#{$status}-dark, var(--primary-dark)); From 85fe74de728de7800af321ba14005f36bcd769ff Mon Sep 17 00:00:00 2001 From: David Newell Date: Mon, 20 Nov 2023 16:04:42 +0000 Subject: [PATCH 3/3] set color primary button --- frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss index 33de7e17b8d53..abe0e6cc3e802 100644 --- a/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss +++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButtonLegacy.scss @@ -140,6 +140,8 @@ body:not(.posthog-3000) { // Primary - blocked color style &.LemonButton--primary { + color: #fff; + .LemonButton__icon { color: #fff; }