diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index 51f4224011837cf816a01708cb78ae139ff69e42..6b5867cf18ff9c006960f554b1c29a2cb163b6ce 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -95,7 +95,7 @@
.name,
.operator,
.value-container {
- color: $gl-text-color;
+ color: var(--gl-token-foreground-color);
}
.name,
@@ -109,21 +109,21 @@
}
.name {
- background-color: $gray-50;
+ background-color: var(--gl-filtered-search-token-type-background-color-default);
border-radius: 2px 0 0 2px;
margin-right: 1px;
text-transform: capitalize;
}
.operator {
- background-color: $gray-50;
+ background-color: var(--gl-filtered-search-token-operator-background-color-default);
margin-right: 1px;
}
.value-container {
display: flex;
align-items: center;
- background-color: $gray-50;
+ background-color: var(--gl-filtered-search-token-data-background-color-default);
border-radius: 0 2px 2px 0;
margin-right: 4px;
padding-right: 4px;
@@ -163,15 +163,15 @@
.filtered-search-token .selected,
.filtered-search-term .selected {
.name {
- background-color: $gray-100;
+ background-color: var(--gl-filtered-search-token-type-background-color-hover);
}
.operator {
- box-shadow: inset 0 0 0 100px $filtered-search-term-shadow-color;
+ background-color: var(--gl-filtered-search-token-operator-background-color-hover);
}
.value-container {
- box-shadow: inset 0 0 0 100px $filtered-search-term-shadow-color;
+ background-color: var(--gl-filtered-search-token-data-background-color-hover);
}
}
@@ -201,7 +201,7 @@
width: 100%;
min-width: 0;
border: 1px solid $gray-400;
- background-color: $white;
+ background-color: var(--gl-control-background-color-default);
border-radius: $gl-border-radius-base;
&.focus,
@@ -227,6 +227,7 @@
padding-right: 25px;
padding-left: 0;
height: #{$input-height - 2px};
+ background-color: transparent;
line-height: inherit;
&,
@@ -244,7 +245,7 @@
position: relative;
min-width: 0;
height: #{$input-height - 2px};
- background-color: $input-bg;
+ background-color: var(--gl-control-background-color-default);
border-radius: $gl-border-radius-base;
}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 2412500f3cdaa473f351374033e2541b44dc4c16..28d38476425931a36710749cebc16f6d87cfd142 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -247,11 +247,6 @@ $dropdown-toggle-active-border-color: darken($border-color, 14%);
$dropdown-fade-mask-height: 32px;
$dropdown-member-form-control-width: 163px;
-/*
-* Filtered Search
-*/
-$filtered-search-term-shadow-color: rgba(0, 0, 0, 0.09);
-
/*
* Sidebar
*/
diff --git a/app/assets/stylesheets/themes/dark_mode_overrides.scss b/app/assets/stylesheets/themes/dark_mode_overrides.scss
index 55c47ddb5847dfc9f181699120ed2f3058f94ebe..559278c48dab8d54894cb6155a113960a494c722 100644
--- a/app/assets/stylesheets/themes/dark_mode_overrides.scss
+++ b/app/assets/stylesheets/themes/dark_mode_overrides.scss
@@ -103,9 +103,6 @@ aside.right-sidebar:not(.right-sidebar-merge-requests) {
}
.gl-dark {
- .gl-filtered-search-token-type,
- .gl-filtered-search-token-operator,
- .gl-filtered-search-token-data,
.gl-filtered-search-suggestion-active {
background-color: $gray-100;
}
@@ -117,18 +114,6 @@ aside.right-sidebar:not(.right-sidebar-merge-requests) {
}
}
- .filtered-search-token {
- .name, .operator, .value-container {
- background-color: $gray-100;
- }
-
- &:hover {
- .operator, .value-container {
- background-color: $gray-200;
- }
- }
- }
-
.filtered-search-wrapper li.droplab-item-active button {
background-color: $gray-100;
diff --git a/package.json b/package.json
index 1dc14884fe8ad1d233eb50d22a5190715595f31c..f2de089334be08e567576eb966b99e60ba9692e7 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
"@gitlab/fonts": "^1.3.0",
"@gitlab/query-language": "^0.0.5-a-20240903",
"@gitlab/svgs": "3.117.0",
- "@gitlab/ui": "94.0.1",
+ "@gitlab/ui": "94.2.0",
"@gitlab/web-ide": "^0.0.1-dev-20240909013227",
"@mattiasbuelens/web-streams-adapter": "^0.1.0",
"@rails/actioncable": "7.0.8-4",
diff --git a/yarn.lock b/yarn.lock
index 564631f1d1039719f84d1451a56cb5cb340ce2c7..ab6f30c4b4fb96a795b390a99fe4eb574bd888f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1362,10 +1362,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.117.0.tgz#a9a45949d73e91f278e019b46220feb63105dd48"
integrity sha512-nBFWh2UN+pFl7nBQUgaUtHRChrZSXdRNmv1J49QPLwyJYWuq51YEBXQW5mPAlvB1BGfiNJPSHSGxWALFZBI5WA==
-"@gitlab/ui@94.0.1":
- version "94.0.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-94.0.1.tgz#4be575ab6e6583ed65ac7c78e70d827706367639"
- integrity sha512-6RD78bQ7Bff1qU3k7E8ZU/4YQ8PD68aRaE7eHojKBtAfR9ClGvPeFMFkTFAdnfV5xjBOE6tKMzR0pOhZE3V6cQ==
+"@gitlab/ui@94.2.0":
+ version "94.2.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-94.2.0.tgz#2e063490bea8940f08d2c8769cc3388fbbf60f53"
+ integrity sha512-nNYGcdL+7zZSXXResmkQDSxLwlq9rcninqSaBCaOXlzRHMYNzMNy6WX48/quFNd30Edn+OiHCaRR4wDNclxA/w==
dependencies:
"@floating-ui/dom" "1.4.3"
echarts "^5.3.2"
@@ -13130,16 +13130,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"
-"string-width-cjs@npm:string-width@^4.2.0":
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -13192,7 +13183,7 @@ string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -13206,13 +13197,6 @@ strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
- dependencies:
- ansi-regex "^5.0.1"
-
strip-ansi@^7.0.1, strip-ansi@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -14904,7 +14888,7 @@ worker-loader@^3.0.8:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -14922,15 +14906,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
-wrap-ansi@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
- dependencies:
- ansi-styles "^4.0.0"
- string-width "^4.1.0"
- strip-ansi "^6.0.0"
-
wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"