From ac6dd64e8e0ed67c35b949e173314e77f1ae8f43 Mon Sep 17 00:00:00 2001 From: Geert Selderslaghs Date: Sun, 8 Dec 2024 21:37:47 +0100 Subject: [PATCH 1/4] enhancement(Collapsible) additional styling for leading badge in collapsible --- sass/components/_badges.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sass/components/_badges.scss b/sass/components/_badges.scss index a0f77038e4..47b9a3295a 100644 --- a/sass/components/_badges.scss +++ b/sass/components/_badges.scss @@ -53,6 +53,10 @@ nav ul a span.badge { .collapsible span.badge { margin-left: auto; + + & + .material-icons { + margin-left: 7px; + } } .collapsible .active span.badge:not(.new) { From a521a824158d2cbf6e2935a1ebbe8fd1cb924a0d Mon Sep 17 00:00:00 2001 From: Geert Selderslaghs Date: Wed, 11 Dec 2024 14:02:06 +0100 Subject: [PATCH 2/4] cherry-pick from #544 --- sass/components/_collapsible.scss | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sass/components/_collapsible.scss b/sass/components/_collapsible.scss index 4b42e89703..95cd0d10a1 100644 --- a/sass/components/_collapsible.scss +++ b/sass/components/_collapsible.scss @@ -31,20 +31,27 @@ } .collapsible-header::after { - content: '▾'; - text-align: right; - margin-right: 0.25rem; - width: 100%; + content: '\e5cf'; + align-self: flex-end; + margin-left: .5rem; + font-family: 'Material Symbols Outlined', 'Material Symbols Rounded', 'Material Symbols Sharp', 'Material Icons'; + font-size: 25px; + line-height: .9; + -webkit-font-smoothing: antialiased; } + .active .collapsible-header::after { - content: "▴"; + content: '\e5ce'; } - .keyboard-focused .collapsible-header:focus { background-color: rgba(0, 0, 0, 0.12); } +.collapsible-header-content { + flex-grow: 1; +} + .collapsible-body { max-height: 0; border-bottom: 1px solid var(--md-sys-color-outline-variant); From 6f83cff039bcef86bf11658d656b9afe7b666984 Mon Sep 17 00:00:00 2001 From: Geert Selderslaghs Date: Wed, 11 Dec 2024 14:03:49 +0100 Subject: [PATCH 3/4] enhancement(CollapsibleBadge) refinement on leading badge positioning without having to change the html dom structure --- sass/components/_badges.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sass/components/_badges.scss b/sass/components/_badges.scss index 47b9a3295a..d96fbf00d6 100644 --- a/sass/components/_badges.scss +++ b/sass/components/_badges.scss @@ -54,8 +54,9 @@ nav ul a span.badge { .collapsible span.badge { margin-left: auto; - & + .material-icons { - margin-left: 7px; + &.leading { + margin-right: 7px; + order: -1; } } From f9c63d9b32d0ebc33bda192a2d059c2af911f151 Mon Sep 17 00:00:00 2001 From: Geert Selderslaghs Date: Wed, 11 Dec 2024 14:34:31 +0100 Subject: [PATCH 4/4] cherry pick 6685ae4f --- sass/components/_collapsible.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/sass/components/_collapsible.scss b/sass/components/_collapsible.scss index 95cd0d10a1..2c106492c4 100644 --- a/sass/components/_collapsible.scss +++ b/sass/components/_collapsible.scss @@ -32,7 +32,6 @@ .collapsible-header::after { content: '\e5cf'; - align-self: flex-end; margin-left: .5rem; font-family: 'Material Symbols Outlined', 'Material Symbols Rounded', 'Material Symbols Sharp', 'Material Icons'; font-size: 25px;