From 75a6c396d131ee093c6f616c274a600c88902df4 Mon Sep 17 00:00:00 2001
From: Matthew Oliveira <m4olivei@gmail.com>
Date: Mon, 24 Feb 2025 15:22:25 -0500
Subject: [PATCH 1/3] Issue #3505124: Fix the more actions button for Chrome
---
.../components/toolbar-button/toolbar-button.component.yml | 1 +
.../navigation/components/toolbar-button/toolbar-button.css | 3 +++
.../components/toolbar-button/toolbar-button.pcss.css | 4 ++++
.../navigation/templates/top-bar-page-actions.html.twig | 2 ++
4 files changed, 10 insertions(+)
diff --git a/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml b/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml
index 0a7e9853f5cc..a071a2e2bebb 100644
--- a/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml
+++ b/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml
@@ -37,6 +37,7 @@ props:
- primary
- small-offset
- weight--400
+ - icon-only
extra_classes:
type: array
title: Extra classes.
diff --git a/core/modules/navigation/components/toolbar-button/toolbar-button.css b/core/modules/navigation/components/toolbar-button/toolbar-button.css
index 10f39dc69185..f394f817677a 100644
--- a/core/modules/navigation/components/toolbar-button/toolbar-button.css
+++ b/core/modules/navigation/components/toolbar-button/toolbar-button.css
@@ -135,6 +135,9 @@
background: linktext;
}
}
+.toolbar-button--icon-only::before {
+ content: "";
+}
.toolbar-button--primary {
--toolbar-button-color: var(--admin-toolbar-color-white);
--toolbar-button-bg: var(--admin-toolbar-color-blue-450);
diff --git a/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css b/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css
index fdd25b8a8042..3ab0c59aac5a 100644
--- a/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css
+++ b/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css
@@ -151,6 +151,10 @@
}
}
+.toolbar-button--icon-only::before {
+ content: "";
+}
+
.toolbar-button--primary {
--toolbar-button-color: var(--admin-toolbar-color-white);
--toolbar-button-bg: var(--admin-toolbar-color-blue-450);
diff --git a/core/modules/navigation/templates/top-bar-page-actions.html.twig b/core/modules/navigation/templates/top-bar-page-actions.html.twig
index c98e8d6a3e08..afea4c7f1347 100644
--- a/core/modules/navigation/templates/top-bar-page-actions.html.twig
+++ b/core/modules/navigation/templates/top-bar-page-actions.html.twig
@@ -23,6 +23,7 @@
{% include 'navigation:toolbar-button' with {
icon: 'dots',
+ action: 'More actions'|t,
attributes: create_attribute(
{
'aria-expanded': 'false',
@@ -30,6 +31,7 @@
'data-drupal-dropdown': 'true'
}
),
+ modifiers: ['icon-only'],
} only %}
<div class="toolbar-dropdown__menu" id={{ dropdown_id }}>
--
GitLab
From c7a326cab16f4446b9115fcbaef9551c0842703f Mon Sep 17 00:00:00 2001
From: Matthew Oliveira <m4olivei@gmail.com>
Date: Tue, 25 Feb 2025 07:37:04 -0500
Subject: [PATCH 2/3] Issue #3505124: Use :not selector instead of new class
---
.../navigation/components/toolbar-button/toolbar-button.css | 2 +-
.../components/toolbar-button/toolbar-button.pcss.css | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/modules/navigation/components/toolbar-button/toolbar-button.css b/core/modules/navigation/components/toolbar-button/toolbar-button.css
index f394f817677a..125ae91de338 100644
--- a/core/modules/navigation/components/toolbar-button/toolbar-button.css
+++ b/core/modules/navigation/components/toolbar-button/toolbar-button.css
@@ -135,7 +135,7 @@
background: linktext;
}
}
-.toolbar-button--icon-only::before {
+[class*="toolbar-button--icon"]:not([data-icon-text])::before {
content: "";
}
.toolbar-button--primary {
diff --git a/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css b/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css
index 3ab0c59aac5a..38634e14a409 100644
--- a/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css
+++ b/core/modules/navigation/components/toolbar-button/toolbar-button.pcss.css
@@ -151,7 +151,7 @@
}
}
-.toolbar-button--icon-only::before {
+[class*="toolbar-button--icon"]:not([data-icon-text])::before {
content: "";
}
--
GitLab
From 72239f576b6c0d8dffefccd0b3a75704013cae6f Mon Sep 17 00:00:00 2001
From: Matthew Oliveira <m4olivei@gmail.com>
Date: Tue, 25 Feb 2025 07:38:30 -0500
Subject: [PATCH 3/3] Issue #3505124: Remove icon-only modifier for
toolbar-button component
---
.../components/toolbar-button/toolbar-button.component.yml | 1 -
core/modules/navigation/templates/top-bar-page-actions.html.twig | 1 -
2 files changed, 2 deletions(-)
diff --git a/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml b/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml
index a071a2e2bebb..0a7e9853f5cc 100644
--- a/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml
+++ b/core/modules/navigation/components/toolbar-button/toolbar-button.component.yml
@@ -37,7 +37,6 @@ props:
- primary
- small-offset
- weight--400
- - icon-only
extra_classes:
type: array
title: Extra classes.
diff --git a/core/modules/navigation/templates/top-bar-page-actions.html.twig b/core/modules/navigation/templates/top-bar-page-actions.html.twig
index afea4c7f1347..2fb8edce6100 100644
--- a/core/modules/navigation/templates/top-bar-page-actions.html.twig
+++ b/core/modules/navigation/templates/top-bar-page-actions.html.twig
@@ -31,7 +31,6 @@
'data-drupal-dropdown': 'true'
}
),
- modifiers: ['icon-only'],
} only %}
<div class="toolbar-dropdown__menu" id={{ dropdown_id }}>
--
GitLab