From 72417a4fa106a2c223812448db05cbfe92becf36 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 3 Feb 2023 14:07:59 +0100
Subject: [PATCH 1/3] Fix color of tertiary button on dark theme

---
 web_src/less/_base.less | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 26fc83785b79f..e58bf53f5df9f 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -2200,9 +2200,7 @@ a.ui.label:hover {
   border: 1px solid var(--color-light-border);
   color: var(--color-text);
 }
-.ui.tertiary.button {
-  border: none;
-}
+
 .page-content .ui.button {
   box-shadow: none !important;
 }
@@ -2319,6 +2317,15 @@ a.ui.label:hover {
   color: var(--color-secondary-dark-8) !important;
 }
 
+.ui.tertiary.button {
+  color: var(--color-text-light);
+  border: none;
+}
+
+.ui.tertiary.button:hover {
+  color: var(--color-text);
+}
+
 .ui.primary.label,
 .ui.primary.labels .label {
   background-color: var(--color-primary) !important;

From a54a53683fa2a7fa1dece9382090bed8a0064198 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 3 Feb 2023 14:31:27 +0100
Subject: [PATCH 2/3] move border removal to helper

---
 templates/user/settings/applications_oauth2_edit_form.tmpl | 2 +-
 web_src/less/_base.less                                    | 1 -
 web_src/less/helpers.less                                  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/settings/applications_oauth2_edit_form.tmpl b/templates/user/settings/applications_oauth2_edit_form.tmpl
index 9d7273fd6d0bf..d382559835c34 100644
--- a/templates/user/settings/applications_oauth2_edit_form.tmpl
+++ b/templates/user/settings/applications_oauth2_edit_form.tmpl
@@ -28,7 +28,7 @@
 			<form class="ui form ignore-dirty" action="{{.FormActionPath}}/regenerate_secret" method="post">
 				{{.CsrfTokenHtml}}
 				{{.locale.Tr "settings.oauth2_regenerate_secret_hint"}}
-				<button class="ui tertiary button" type="submit">{{.locale.Tr "settings.oauth2_regenerate_secret"}}</button>
+				<button class="ui tertiary button border-none" type="submit">{{.locale.Tr "settings.oauth2_regenerate_secret"}}</button>
 			</form>
 		</div>
 	</div>
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index e58bf53f5df9f..8f238c829b61f 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -2319,7 +2319,6 @@ a.ui.label:hover {
 
 .ui.tertiary.button {
   color: var(--color-text-light);
-  border: none;
 }
 
 .ui.tertiary.button:hover {
diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less
index 46284811eeba2..3603908b0bf6a 100644
--- a/web_src/less/helpers.less
+++ b/web_src/less/helpers.less
@@ -21,6 +21,7 @@
 
 /* below class names match Tailwind CSS */
 .pointer-events-none { pointer-events: none !important; }
+.border-none { border-style: none !important; }
 
 .mono {
   font-family: var(--fonts-monospace) !important;

From aada443ea99f397868d34be974aa09c88e987442 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 3 Feb 2023 14:46:54 +0100
Subject: [PATCH 3/3] Revert "move border removal to helper"

This reverts commit a54a53683fa2a7fa1dece9382090bed8a0064198.
---
 templates/user/settings/applications_oauth2_edit_form.tmpl | 2 +-
 web_src/less/_base.less                                    | 1 +
 web_src/less/helpers.less                                  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/settings/applications_oauth2_edit_form.tmpl b/templates/user/settings/applications_oauth2_edit_form.tmpl
index d382559835c34..9d7273fd6d0bf 100644
--- a/templates/user/settings/applications_oauth2_edit_form.tmpl
+++ b/templates/user/settings/applications_oauth2_edit_form.tmpl
@@ -28,7 +28,7 @@
 			<form class="ui form ignore-dirty" action="{{.FormActionPath}}/regenerate_secret" method="post">
 				{{.CsrfTokenHtml}}
 				{{.locale.Tr "settings.oauth2_regenerate_secret_hint"}}
-				<button class="ui tertiary button border-none" type="submit">{{.locale.Tr "settings.oauth2_regenerate_secret"}}</button>
+				<button class="ui tertiary button" type="submit">{{.locale.Tr "settings.oauth2_regenerate_secret"}}</button>
 			</form>
 		</div>
 	</div>
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 8f238c829b61f..e58bf53f5df9f 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -2319,6 +2319,7 @@ a.ui.label:hover {
 
 .ui.tertiary.button {
   color: var(--color-text-light);
+  border: none;
 }
 
 .ui.tertiary.button:hover {
diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less
index 3603908b0bf6a..46284811eeba2 100644
--- a/web_src/less/helpers.less
+++ b/web_src/less/helpers.less
@@ -21,7 +21,6 @@
 
 /* below class names match Tailwind CSS */
 .pointer-events-none { pointer-events: none !important; }
-.border-none { border-style: none !important; }
 
 .mono {
   font-family: var(--fonts-monospace) !important;