Merge branch 'psi-border-same' into 'master'

Fix some button border colors in dark mode See merge request gitlab-org/gitlab!67389

Merge branch 'psi-border-same' into 'master'
Fix some button border colors in dark mode See merge request gitlab-org/gitlab!67389
b424f289 · Miguel Rincon · 12319765 · 72645ee3 · b424f289 · b424f289
Commit b424f289 authored Aug 03, 2021 by Miguel Rincon
3 changed files
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -480,7 +480,7 @@ body {
 .btn:active,
 .btn.active {
  background-color: #444;
-  border-color: #fafafa;
+  border-color: #4f4f4f;
  color: #fafafa;
 }
 .btn svg {

--- a/app/assets/stylesheets/themes/_dark.scss
+++ b/app/assets/stylesheets/themes/_dark.scss
@@ -186,8 +186,7 @@ body.gl-dark {
  }
 }

-$border-white-light: $gray-900;
-$border-white-normal: $gray-900;
+$border-white-normal: $border-color;

 $body-bg: $gray-10;
 $input-bg: $white;

--- a/ee/app/assets/stylesheets/startup/startup-dark.scss
+++ b/ee/app/assets/stylesheets/startup/startup-dark.scss
@@ -480,7 +480,7 @@ body {
 .btn:active,
 .btn.active {
  background-color: #444;
-  border-color: #fafafa;
+  border-color: #4f4f4f;
  color: #fafafa;
 }
 .btn svg {