Skip to content

A platform for community discussion. Free, open, simple.

UX: input & button borders should match (#40709)

Jordan Vidrine1d8a92fd70b3
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
index e25559ff785..0ed03508cd2 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
@@ -1,7 +1,7 @@
.uc-modernize-foundation-theme {
--d-button-default-bg-color: var(--secondary);
- --d-button-default-border: 1px solid var(--primary-200);
- --d-button-default-border--hover: 1px solid var(--primary-300);
+ --d-button-default-border: 1px solid var(--primary-300);
+ --d-button-default-border--hover: 1px solid var(--primary-400);
--d-button-default-bg-color--hover: var(--primary-200);
--d-button-default-text-color--hover: var(--primary);
--d-button-default-icon-color--hover: var(--primary);
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
index 7d977b66231..f1c39779461 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
@@ -9,5 +9,6 @@
// Misc
--main-outlet-padding-top: var(--space-4);
--d-nav-underline-height: var(--space-half);
- --input-border-color: light-dark(var(--primary-200), var(--primary-300));
+ --d-input-border: 1px solid var(--primary-300);
+ --input-border-color: var(--primary-300);
}
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index 4ba6fb10f88..780c5b74e50 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -27,7 +27,7 @@
.select-kit-header {
background: var(--secondary);
- border-color: var(--primary-400);
+ border-color: var(--input-border-color);
&.is-focused {
@include default-focus;
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index cc6ae127fed..661ebad0f29 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -52,7 +52,7 @@
.multi-select-header {
background: var(--secondary);
- border-color: var(--primary-400);
+ border-color: var(--input-border-color);
.formatted-selection {
margin: 0;