From e72184f31cc3909150f30f52fa89a653eb82b837 Mon Sep 17 00:00:00 2001 From: Mike L Date: Sat, 20 Mar 2021 12:02:33 +0100 Subject: [PATCH 1/2] Counterwork adverse effect of #14926 --- web_src/less/_base.less | 1 + web_src/less/_repository.less | 19 +++++++++++++++++++ web_src/less/themes/theme-arc-green.less | 1 + 3 files changed, 21 insertions(+) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 121a2b206419c..8323ed7b88a62 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -97,6 +97,7 @@ --color-input-border-hover: #cecece; --color-navbar: #f8f8f8; --color-light: #00000004; + --color-light-undo-disabling: rgba(0, 0, 0, calc(4 / 255 * 222 / 255 / var(--opacity-disabled))); --color-light-border: #0000001d; --color-hover: #0000000d; --color-active: #00000012; diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 9f40c0c618b6b..8c8af3e16e201 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2864,8 +2864,23 @@ tbody.commit-list { align-items: center; } +.repo-buttons .ui.labeled.button > .label:hover { + color: var(--color-primary-light-2); + background: var(--color-light); +} + +.label-mimic-enabled() { + color: var(--color-text-dark); + background: var(--color-light-undo-disabling) !important; + + &:hover { + color: var(--color-primary-dark-1); + } +} + .repo-buttons button[disabled] ~ .label { opacity: var(--opacity-disabled); + .label-mimic-enabled(); } .repo-buttons .ui.labeled.button { @@ -2879,6 +2894,10 @@ tbody.commit-list { &.disabled { pointer-events: inherit !important; + > .label { + .label-mimic-enabled(); + } + > .button { pointer-events: none !important; } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 9f35d4dafe55b..343f9283ae92b 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -92,6 +92,7 @@ --color-input-border-hover: #505667; --color-navbar: #2a2e3a; --color-light: #00000028; + --color-light-undo-disabling: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled))); --color-light-border: #ffffff28; --color-hover: #60606020; --color-active: #60606040; From d8d27e6b7cba21870e9de323fc0c337262fb86bd Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Wed, 23 Jun 2021 22:14:10 +0100 Subject: [PATCH 2/2] mimic-enabled Signed-off-by: Andrew Thornton --- web_src/less/_repository.less | 2 +- web_src/less/themes/theme-arc-green.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 4616f8959b0ca..e87560fb8b0a2 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2939,7 +2939,7 @@ tbody.commit-list { .label-mimic-enabled() { color: var(--color-text-dark); - background: var(--color-light-undo-disabling) !important; + background: var(--color-light-mimic-enabled) !important; &:hover { color: var(--color-primary-dark-1); diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 67866820a6d82..40290f3a9e274 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -92,7 +92,7 @@ --color-input-border-hover: #505667; --color-navbar: #2a2e3a; --color-light: #00000028; - --color-light-undo-disabling: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled))); + --color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled))); --color-light-border: #ffffff28; --color-hover: #ffffff10; --color-active: #ffffff16;