From 8fa2fbf74694b5932162f222cb3409baaf4b4b2c Mon Sep 17 00:00:00 2001
From: Sascha Eggenberger <seggenberger@gitlab.com>
Date: Fri, 22 Mar 2024 21:12:16 +0000
Subject: [PATCH] Well segment: Change border color to default gray-100
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147674
Changelog: changed
---
app/assets/stylesheets/bootstrap_migration_components.scss | 6 +++---
app/assets/stylesheets/framework/variables.scss | 2 --
app/assets/stylesheets/framework/wells.scss | 2 +-
app/assets/stylesheets/themes/_dark.scss | 1 -
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app/assets/stylesheets/bootstrap_migration_components.scss b/app/assets/stylesheets/bootstrap_migration_components.scss
index 1acb93ae33f84..58e14a9c77a09 100644
--- a/app/assets/stylesheets/bootstrap_migration_components.scss
+++ b/app/assets/stylesheets/bootstrap_migration_components.scss
@@ -118,9 +118,9 @@ input[type='file'] {
margin-bottom: 16px;
.ref-list {
- border-color: $well-inner-border;
+ border-color: $gray-100;
}
-
+
.well-segment {
padding: 1rem;
@@ -132,7 +132,7 @@ input[type='file'] {
}
&:not(:last-of-type) {
- border-bottom: 1px solid $well-inner-border;
+ border-bottom: 1px solid $gray-100;
}
p,
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index b5ddae8a859d0..63a0aceac4ebf 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -122,8 +122,6 @@ $contextual-sidebar-border-color: #e9e9e9;
$border-color: $gray-100;
$shadow-color: $t-gray-a-08;
$well-expand-item: #e8f2f7 !default;
-$well-inner-border: #eef0f2 !default;
-$well-light-border: #f1f1f1;
$nav-active-bg: $t-gray-a-08;
/*
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 1434c16b68fc1..2dd4d9bad3cef 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -8,7 +8,7 @@
padding: $gl-padding;
&:not(:last-of-type) {
- border-bottom: 1px solid $well-inner-border;
+ border-bottom: 1px solid $gray-100;
}
&.borderless {
diff --git a/app/assets/stylesheets/themes/_dark.scss b/app/assets/stylesheets/themes/_dark.scss
index cb0da7e782dfd..95ead0a08a379 100644
--- a/app/assets/stylesheets/themes/_dark.scss
+++ b/app/assets/stylesheets/themes/_dark.scss
@@ -43,4 +43,3 @@ $line-added-dark: $green-200;
$line-removed-dark: $red-200;
$well-expand-item: $gray-200;
-$well-inner-border: $gray-200;
--
GitLab