From 457e2606226fa97eca5d98608ef2fe5105d6e83c Mon Sep 17 00:00:00 2001 From: Albina Starykova Date: Fri, 7 Jul 2023 10:33:47 +0300 Subject: [PATCH] Update styles for userbar and a11y checker in dark mode --- CHANGELOG.txt | 1 + client/scss/components/_userbar.scss | 8 ++++++-- docs/releases/5.1.md | 1 + wagtail/admin/templates/wagtailadmin/skeleton.html | 2 +- wagtail/admin/templates/wagtailadmin/userbar/base.html | 2 +- .../wagtailadmin/userbar/item_accessibility.html | 3 ++- wagtail/admin/templatetags/wagtailadmin_tags.py | 5 +++-- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bf4d9d1252..44b5ba4426 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -28,6 +28,7 @@ Changelog * Add support for AVIF images (Aman Pandey) * Change the default WebP quality to 80 to match AVIF (Aman Pandey) * Adopt optimised Wagtail logo in the admin interface (Albina Starykova) + * Add support for presenting the userbar (Wagtail button) in dark mode (Albina Starykova) * Fix: Prevent choosers from failing when initial value is an unrecognised ID, e.g. when moving a page from a location where `parent_page_types` would disallow it (Dan Braghis) * Fix: Move comment notifications toggle to the comments side panel (Sage Abdullah) * Fix: Remove comment button on InlinePanel fields (Sage Abdullah) diff --git a/client/scss/components/_userbar.scss b/client/scss/components/_userbar.scss index 03c5b526e0..8eb4054b3c 100644 --- a/client/scss/components/_userbar.scss +++ b/client/scss/components/_userbar.scss @@ -69,7 +69,7 @@ $positions: ( width: $size-home-button; height: $size-home-button; margin: 0; - background-color: theme('colors.surface-page'); + background-color: theme('colors.white.DEFAULT'); border: 2px solid transparent; border-radius: 50%; padding: 0; @@ -258,6 +258,10 @@ $positions: ( background: theme('colors.surface-page'); } + .w-dialog__close-icon { + color: theme('colors.text-context'); + } + .w-dialog__content { padding: 0; min-height: unset; @@ -319,7 +323,7 @@ $positions: ( .w-a11y-result__selector { display: flex; align-items: center; - background: theme('colors.surface-header'); + background: theme('colors.surface-field-inactive'); color: theme('colors.text-context'); border-radius: theme('borderRadius.DEFAULT'); margin-inline-end: theme('spacing.[2.5]'); diff --git a/docs/releases/5.1.md b/docs/releases/5.1.md index 17e12f37f5..f04ef292c8 100644 --- a/docs/releases/5.1.md +++ b/docs/releases/5.1.md @@ -75,6 +75,7 @@ This feature was developed by Aman Pandey as part of the Google Summer of Code p * Purge revisions of non-page models in `purge_revisions` command (Sage Abdullah) * Change the default WebP quality to 80 to match AVIF (Aman Pandey) * Adopt optimised Wagtail logo in the admin interface (Albina Starykova) +* Add support for presenting the userbar (Wagtail button) in dark mode (Albina Starykova) ### Bug fixes diff --git a/wagtail/admin/templates/wagtailadmin/skeleton.html b/wagtail/admin/templates/wagtailadmin/skeleton.html index 108d0b0c78..49aa0b91c5 100644 --- a/wagtail/admin/templates/wagtailadmin/skeleton.html +++ b/wagtail/admin/templates/wagtailadmin/skeleton.html @@ -2,7 +2,7 @@ {% load wagtailadmin_tags i18n %} {% get_current_language as LANGUAGE_CODE %} {% get_current_language_bidi as LANGUAGE_BIDI %} - + {% block titletag %}{% endblock %} - {% block branding_title %}Wagtail{% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/userbar/base.html b/wagtail/admin/templates/wagtailadmin/userbar/base.html index 55b1a6b54e..520f2c1425 100644 --- a/wagtail/admin/templates/wagtailadmin/userbar/base.html +++ b/wagtail/admin/templates/wagtailadmin/userbar/base.html @@ -2,7 +2,7 @@