From b57883552bf97ffa652b8b3c5704f991d2729b3f Mon Sep 17 00:00:00 2001
From: Sascha Eggenberger <hello@saschaeggenberger.com>
Date: Mon, 4 Nov 2024 23:05:46 +0100
Subject: [PATCH] Issue #3485509: Core navigation: Move Announcements to
Navigation
---
dist/css/layout/core_navigation.css | 5 +++--
dist/css/theme/variables.css | 2 +-
styles/layout/core_navigation.scss | 10 +++++++---
styles/theme/variables.scss | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dist/css/layout/core_navigation.css b/dist/css/layout/core_navigation.css
index f684234fc..1fa8c48ee 100644
--- a/dist/css/layout/core_navigation.css
+++ b/dist/css/layout/core_navigation.css
@@ -452,7 +452,7 @@ body.gin--core-navigation {
}
#navigation-block-shortcuts,
-#navigation-link-announcements-feedannouncement,
+#toolbar-item-announcement,
.toolbar-block:has(.admin-toolbar__item:first-of-type:last-of-type > #menu--shortcuts) {
display: none;
}
@@ -473,7 +473,8 @@ body.gin--core-navigation {
border-inline-start: none;
}
-.toolbar-loading #toolbar-item-shortcuts-tray {
+.toolbar-loading #toolbar-item-shortcuts-tray,
+.toolbar-loading #toolbar-item-shortcuts {
visibility: hidden;
}
diff --git a/dist/css/theme/variables.css b/dist/css/theme/variables.css
index 66934606c..34d68c2e6 100644
--- a/dist/css/theme/variables.css
+++ b/dist/css/theme/variables.css
@@ -221,7 +221,7 @@
--gin-border-color-layer: rgba(0, 0, 0, .05);
--gin-border-color-layer2: #76777b;
--gin-border-color-table: #43454a;
- --gin-border-color-table-header: rgba(255, 255, 255, .12);
+ --gin-border-color-table-header: rgba(255, 255, 255, .4);
--gin-border-color-form-element: var(--gin-border-color-layer2);
--gin-bg-header: #1b1b1d;
--gin-switch: var(--gin-color-primary);
diff --git a/styles/layout/core_navigation.scss b/styles/layout/core_navigation.scss
index a8d109465..09c88872a 100644
--- a/styles/layout/core_navigation.scss
+++ b/styles/layout/core_navigation.scss
@@ -306,9 +306,12 @@ body.gin--core-navigation {
// --------------------------------------------------
// Hide Shortcuts & Announcements in primary nav
// --------------------------------------------------
+// #toolbar-item-shortcuts,
#navigation-block-shortcuts,
-#navigation-link-announcements-feedannouncement,
-.toolbar-block:has(.admin-toolbar__item:first-of-type:last-of-type > #menu--shortcuts) {
+#toolbar-item-announcement,
+// #navigation-link-announcements-feedannouncement,
+.toolbar-block:has(.admin-toolbar__item:first-of-type:last-of-type > #menu--shortcuts)
+{
display: none;
}
@@ -336,6 +339,7 @@ body.gin--core-navigation {
}
// Fix weird shortcuts menu flickering.
-.toolbar-loading #toolbar-item-shortcuts-tray {
+.toolbar-loading #toolbar-item-shortcuts-tray,
+.toolbar-loading #toolbar-item-shortcuts {
visibility: hidden;
}
diff --git a/styles/theme/variables.scss b/styles/theme/variables.scss
index 69e141c32..0ea76c019 100644
--- a/styles/theme/variables.scss
+++ b/styles/theme/variables.scss
@@ -276,7 +276,7 @@
--gin-border-color-table: #43454a;
// Tabs
- --gin-border-color-table-header: rgba(255, 255, 255, .12);
+ --gin-border-color-table-header: rgba(255, 255, 255, .4);
// Form element
--gin-border-color-form-element: var(--gin-border-color-layer2);
--
GitLab