From 81e7bed67eda4422fb1ca74c631be50aa68d0c64 Mon Sep 17 00:00:00 2001
From: Scott de Jonge <sdejonge@gitlab.com>
Date: Mon, 15 Jul 2024 19:46:56 +0000
Subject: [PATCH] Update @gitlab/ui to 86.10.1
---
.../stylesheets/framework/variables.scss | 4 +--
lib/gitlab/themes.rb | 2 +-
package.json | 2 +-
scripts/frontend/lib/tailwind_migration.mjs | 30 +++++++++----------
yarn.lock | 8 ++---
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 6486ecbacfd2..1bd5541585f3 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -508,8 +508,8 @@ $board-swimlanes-headers-height: 64px;
/*
Source Editor theme overrides
*/
-$source-editor-hover-light-text-color: #ececef;
-$source-editor-hover-dark-text-color: #333238;
+$source-editor-hover-light-text-color: $gl-color-neutral-50;
+$source-editor-hover-dark-text-color: $gl-color-neutral-900;
/**
Bootstrap 4.2.0 introduced new icons for validating forms.
diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb
index 387fbb326386..c7c5296be953 100644
--- a/lib/gitlab/themes.rb
+++ b/lib/gitlab/themes.rb
@@ -26,7 +26,7 @@ def available_themes
Theme.new(8, s_('NavigationTheme|Light Green'), 'ui-light-green', '#1b653f'),
Theme.new(9, s_('NavigationTheme|Red'), 'ui-red', '#580d02'),
Theme.new(10, s_('NavigationTheme|Light Red'), 'ui-light-red', '#a02e1c'),
- Theme.new(2, s_('NavigationTheme|Gray'), 'ui-gray', '#333238'),
+ Theme.new(2, s_('NavigationTheme|Gray'), 'ui-gray', '#28272d'),
Theme.new(3, s_('NavigationTheme|Neutral'), 'ui-neutral', '#ececef')
]
end
diff --git a/package.json b/package.json
index e24e896f80c8..3624aa0635f1 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/fonts": "^1.3.0",
"@gitlab/svgs": "3.105.0",
- "@gitlab/ui": "^86.9.1",
+ "@gitlab/ui": "^86.10.1",
"@gitlab/web-ide": "^0.0.1-dev-20240613133550",
"@mattiasbuelens/web-streams-adapter": "^0.1.0",
"@rails/actioncable": "7.0.8-4",
diff --git a/scripts/frontend/lib/tailwind_migration.mjs b/scripts/frontend/lib/tailwind_migration.mjs
index 9976ffe75238..23b909526de3 100644
--- a/scripts/frontend/lib/tailwind_migration.mjs
+++ b/scripts/frontend/lib/tailwind_migration.mjs
@@ -88,47 +88,47 @@ const hardcodedColorsToCSSVarsMap = {
shadow: {}, // This util already uses hardcoded colors in its legacy version
'shadow-x0-y2-b4-s0': {}, // This util already uses hardcoded colors in its legacy version
'shadow-sm': {
- '#1f1e2414': '--t-gray-a-08', // The dark theme override does not yet exist
+ '#05050614': '--gl-color-alpha-dark-8', // The dark theme override does not yet exist
},
'shadow-md': {
- '#1f1e2429': '--t-gray-a-16', // The dark theme override does not yet exist
+ '#05050629': '--gl-color-alpha-dark-6', // The dark theme override does not yet exist
},
'shadow-lg': {
- '#1f1e2429': '--t-gray-a-16', // The dark theme override does not yet exist
+ '#05050629': '--gl-color-alpha-dark-6', // The dark theme override does not yet exist
},
'text-contrast-light': {}, // The legacy util references the $white-contrast variable for which we have no dark theme override
'text-black-normal': {
- '#333': '--gray-900',
+ '#333': '--gl-text-color-default',
},
'text-body': {
- '#333238': '--gl-text-primary',
+ '#28272d': '--gl-text-color-default',
},
'text-secondary': {
'#737278': '--gl-text-secondary',
},
'border-gray-a-08': {
- '#1f1e2414': '--t-gray-a-08', // The dark theme override does not yet exist
+ '#05050614': '--gl-color-alpha-dark-8', // The dark theme override does not yet exist
},
'inset-border-1-gray-a-08': {
- '#1f1e2414': '--t-gray-a-08', // The dark theme override does not yet exist
+ '#05050614': '--gl-color-alpha-dark-8', // The dark theme override does not yet exist
},
'border-gray-a-24': {
- '#1f1e243d': '--t-gray-a-24', // The dark theme override does not yet exist
+ '#0505063d': '--gl-color-alpha-dark-24', // The dark theme override does not yet exist
},
border: {
- '#dcdcde': '--gray-100',
+ '#dcdcde': '--gl-border-color-default',
},
'border-t': {
- '#dcdcde': '--gray-100',
+ '#dcdcde': '--gl-border-color-default',
},
'border-r': {
- '#dcdcde': '--gray-100',
+ '#dcdcde': '--gl-border-color-default',
},
'border-b': {
- '#dcdcde': '--gray-100',
+ '#dcdcde': '--gl-border-color-default',
},
'border-l': {
- '#dcdcde': '--gray-100',
+ '#dcdcde': '--gl-border-color-default',
},
'-focus': {
'#fff': '--white',
@@ -166,7 +166,7 @@ export function getColorTokens(tokens) {
* Returns a reverse mapping of hex values to tokens, e.g.
*
* {
- * '#333238': [ 'color-neutral-900', 'icon-color-strong', 'gray-900' ]
+ * '#28272d': [ 'color-neutral-900', 'icon-color-strong', 'gray-900' ]
* }
*
* @param rawTokens
@@ -205,7 +205,7 @@ export const darkModeTokenToHex = Object.fromEntries(
// We overwrite the following classes in
// app/assets/stylesheets/themes/_dark.scss
-darkModeTokenToHex['t-gray-a-08'] = '#fbfafd14'; // rgba($gray-950, 0.08);
+darkModeTokenToHex['gl-color-alpha-dark-8'] = '#fbfafd14'; // rgba($gray-950, 0.08);
darkModeTokenToHex['gl-text-secondary'] = '#bfbfc3'; // $gray-700
function isImportant(selector) {
diff --git a/yarn.lock b/yarn.lock
index aa2ea1a6e3f2..ad9dab3a47d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1357,10 +1357,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.105.0.tgz#0d15978755093b79e5c9b883a27d8074bf316e9a"
integrity sha512-JrXE7T3j+9FyQakG4XVg/uhXL3TZvmFgTuggaiSXdyelVOqAzYdPPm1oergdp8C+Io0zBKlLkJv/4nWG3AgkfQ==
-"@gitlab/ui@^86.9.1":
- version "86.9.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-86.9.1.tgz#ec02a4c77c3642a3b0b5391ede6a15dedde31628"
- integrity sha512-91mctMAFNgugLf7Q126cZvMfhT0W5j5cPOA7oSKk8flCyGODDt7X3g53gDwQZ0kCYDp1oHXK9MenE+BWxK0Elw==
+"@gitlab/ui@^86.10.1":
+ version "86.10.1"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-86.10.1.tgz#16463b1aff04683c62316b9c8b1a0e9e2917916f"
+ integrity sha512-LOV8HmZcgDTKq4/Yp45kncYjl20pTPWdhUWUwcTQlX6ewMYBkO/ip6wTLAQx7LVrBGXMlbHlk5PVbiwgatgulA==
dependencies:
"@floating-ui/dom" "1.4.3"
echarts "^5.3.2"
--
GitLab