From 860c185b95bdfecab86bc1405f919567bec22e0e Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Thu, 15 Aug 2024 17:37:51 +0200 Subject: [PATCH 1/2] Fix: Inconsistent color codes for dark mode and preferes-color-scheme: auto` --- cms/static/cms/sass/settings/_cms.scss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cms/static/cms/sass/settings/_cms.scss b/cms/static/cms/sass/settings/_cms.scss index 91a957fbd82..5fd58e45808 100644 --- a/cms/static/cms/sass/settings/_cms.scss +++ b/cms/static/cms/sass/settings/_cms.scss @@ -41,12 +41,12 @@ $black: var(--dca-black); --dca-white: #2A2C2E; --dca-black: #FFF; --dca-primary: #58D1FC; - --dca-gray: #ccc; // $gray-light; - --dca-gray-lightest: #444; //$gray-darkest; - --dca-gray-lighter: #666; //$gray-darker; - --dca-gray-light: #888; // $gray-light; - --dca-gray-darker: #ddd; //$gray; - --dca-gray-darkest: #eee; // $gray-lighter; + --dca-gray: #ccc; + --dca-gray-lightest: #444; + --dca-gray-lighter: #666; + --dca-gray-light: #888; + --dca-gray-darker: #ddd; + --dca-gray-darkest: #eee; --dca-gray-super-lightest: #333; --active-brightness: 2; @@ -60,12 +60,12 @@ $black: var(--dca-black); --dca-white: #2A2C2E; --dca-black: #FFF; --dca-primary: #58D1FC; - --dca-gray: #999; // $gray-light; - --dca-gray-lightest: #444; //$gray-darkest; - --dca-gray-lighter: #666; //$gray-darker; - --dca-gray-light: #888; // $gray-light; - --dca-gray-darker: #aaa; //$gray; - --dca-gray-darkest: #eee; // $gray-lighter; + --dca-gray: #ccc; + --dca-gray-lightest: #444; + --dca-gray-lighter: #666; + --dca-gray-light: #888; + --dca-gray-darker: #ddd; + --dca-gray-darkest: #eee; --dca-gray-super-lightest: #333; --active-brightness: 2; From f0d9165a26613cc7b882fd471b0b0e4db3710592 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Thu, 15 Aug 2024 19:56:22 +0200 Subject: [PATCH 2/2] Fix ruff issue --- cms/toolbar/items.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/toolbar/items.py b/cms/toolbar/items.py index 100fff68149..a0964ae4bf0 100644 --- a/cms/toolbar/items.py +++ b/cms/toolbar/items.py @@ -152,8 +152,7 @@ def get_alphabetical_insert_position(self, new_menu_name, item_type, if result.item.name > new_menu_name: return result.index - if result.index > last_position: - last_position = result.index + last_position = max(result.index, last_position) else: return last_position + 1