diff --git a/src/apps/dashboard/tests/integrated/test_views.py b/src/apps/dashboard/tests/integrated/test_views.py index 5ff2833..7c3f2f0 100644 --- a/src/apps/dashboard/tests/integrated/test_views.py +++ b/src/apps/dashboard/tests/integrated/test_views.py @@ -290,7 +290,7 @@ class SetPaletteTest(TestCase): self.assertEqual(self.user.palette, "palette-default") def test_locked_palette_is_rejected(self): - response = self.client.post("/dashboard/set_palette", data={"palette": "palette-nirvana"}) + response = self.client.post("/dashboard/set_palette", data={"palette": "palette-bardo"}) self.user.refresh_from_db() self.assertEqual(self.user.palette, "palette-default") self.assertRedirects(response, "/", fetch_redirect_response=False) @@ -302,16 +302,16 @@ class SetPaletteTest(TestCase): def test_set_palette_returns_json_when_requested(self): response = self.client.post( "/dashboard/set_palette", - data={"palette": "palette-sepia"}, + data={"palette": "palette-cedar"}, headers={"Accept": "application/json"}, ) self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), {"palette": "palette-sepia"}) + self.assertEqual(response.json(), {"palette": "palette-cedar"}) def test_locked_palette_returns_unchanged_json(self): response = self.client.post( "/dashboard/set_palette", - data={"palette": "palette-nirvana"}, + data={"palette": "palette-bardo"}, headers={"Accept": "application/json"}, ) self.assertEqual(response.status_code, 200) diff --git a/src/apps/dashboard/views.py b/src/apps/dashboard/views.py index 953d9aa..eb8d3b2 100644 --- a/src/apps/dashboard/views.py +++ b/src/apps/dashboard/views.py @@ -24,16 +24,16 @@ from apps.lyric.models import PaymentMethod, Token, User, Wallet APPLET_ORDER = ["wallet", "new-note", "my-notes", "username", "palette"] UNLOCKED_PALETTES = frozenset([ "palette-default", - "palette-sepia", + "palette-cedar", "palette-oblivion-light", "palette-monochrome-dark", ]) PALETTES = [ {"name": "palette-default", "label": "Earthman", "locked": False}, - {"name": "palette-sepia", "label": "Sepia", "locked": False}, + {"name": "palette-cedar", "label": "Cedar", "locked": False}, {"name": "palette-oblivion-light", "label": "Oblivion (Light)", "locked": False}, {"name": "palette-monochrome-dark", "label": "Monochrome (Dark)", "locked": False}, - {"name": "palette-nirvana", "label": "Nirvana", "locked": True}, + {"name": "palette-bardo", "label": "Bardo", "locked": True}, {"name": "palette-sheol", "label": "Sheol", "locked": True}, {"name": "palette-inferno", "label": "Inferno", "locked": True}, {"name": "palette-terrestre", "label": "Terrestre", "locked": True}, diff --git a/src/static_src/scss/rootvars.scss b/src/static_src/scss/rootvars.scss index 3258ee3..d940b9a 100644 --- a/src/static_src/scss/rootvars.scss +++ b/src/static_src/scss/rootvars.scss @@ -234,6 +234,8 @@ --secTrs: 161, 208, 202; --terTrs: 81, 153, 139; --quaTrs: 47, 89, 85; + --quiTrs: 27, 66, 63; + --sixTrs: 18, 44, 41; // swamp (Eros's Styx) --priSwp: 221, 206, 149; --secSwp: 148, 150, 103; @@ -335,16 +337,16 @@ --ninUser: var(--sixPu); --decUser: var(--terPu); } -/* Blissful Nirvana Palette */ -.palette-nirvana { - --priUser: var(--priU); - --secUser: var(--quiU); - --terUser: var(--priMe); - --quaUser: var(--quiCu); - --quiUser: var(--terCu); +/* Bardo Palette */ +.palette-bardo { + --priUser: var(--sixTrs); + --secUser: var(--sixU); + --terUser: var(--priCfw); + --quaUser: var(--quiAu); + --quiUser: var(--secCu); --sixUser: var(--terKhk); --sepUser: var(--priKhk); - --octUser: var(--terMe); + --octUser: var(--priPer); --ninUser: var(--sixCu); --decUser: var(--terU); } @@ -387,6 +389,9 @@ --ninUser: var(--secClh); --decUser: var(--quiClh); } +/* Obon Palette */ + +/* Nebula Palette */ /* Monochrome Dark Palette */ .palette-monochrome-dark { @@ -414,8 +419,8 @@ --ninUser: var(--terNi); /* 255,251,246 — warm bright highlight */ --decUser: var(--terPt); /* 189,190,189 — light mid */ } -/* Sepia Palette */ -.palette-sepia { +/* Cedar Palette */ +.palette-cedar { --priUser: var(--priCu); /* 46,24,5 — very dark warm brown bg */ --secUser: var(--quiCu); /* 207,173,143 — warm beige text/border */ --terUser: var(--priBpk); /* 214,186,84 — amber gold accent */