Skip to content

Commit f82bcac

Browse files
authored
fix: Inconsistent color codes for dark mode and preferes-color-scheme: auto (#7979)
* Fix: Inconsistent color codes for dark mode and preferes-color-scheme: auto` * Fix ruff issue
1 parent 59d50f2 commit f82bcac

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

cms/static/cms/sass/settings/_cms.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ $black: var(--dca-black);
4141
--dca-white: #2A2C2E;
4242
--dca-black: #FFF;
4343
--dca-primary: #58D1FC;
44-
--dca-gray: #ccc; // $gray-light;
45-
--dca-gray-lightest: #444; //$gray-darkest;
46-
--dca-gray-lighter: #666; //$gray-darker;
47-
--dca-gray-light: #888; // $gray-light;
48-
--dca-gray-darker: #ddd; //$gray;
49-
--dca-gray-darkest: #eee; // $gray-lighter;
44+
--dca-gray: #ccc;
45+
--dca-gray-lightest: #444;
46+
--dca-gray-lighter: #666;
47+
--dca-gray-light: #888;
48+
--dca-gray-darker: #ddd;
49+
--dca-gray-darkest: #eee;
5050
--dca-gray-super-lightest: #333;
5151

5252
--active-brightness: 2;
@@ -60,12 +60,12 @@ $black: var(--dca-black);
6060
--dca-white: #2A2C2E;
6161
--dca-black: #FFF;
6262
--dca-primary: #58D1FC;
63-
--dca-gray: #999; // $gray-light;
64-
--dca-gray-lightest: #444; //$gray-darkest;
65-
--dca-gray-lighter: #666; //$gray-darker;
66-
--dca-gray-light: #888; // $gray-light;
67-
--dca-gray-darker: #aaa; //$gray;
68-
--dca-gray-darkest: #eee; // $gray-lighter;
63+
--dca-gray: #ccc;
64+
--dca-gray-lightest: #444;
65+
--dca-gray-lighter: #666;
66+
--dca-gray-light: #888;
67+
--dca-gray-darker: #ddd;
68+
--dca-gray-darkest: #eee;
6969
--dca-gray-super-lightest: #333;
7070

7171
--active-brightness: 2;

cms/toolbar/items.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ def get_alphabetical_insert_position(self, new_menu_name, item_type,
152152
if result.item.name > new_menu_name:
153153
return result.index
154154

155-
if result.index > last_position:
156-
last_position = result.index
155+
last_position = max(result.index, last_position)
157156
else:
158157
return last_position + 1
159158

0 commit comments

Comments
 (0)