From 6438e345790f017393687ff88c798d4e4dc3c7f3 Mon Sep 17 00:00:00 2001
From: Lugubris <lugubris@disroot.org>
Date: Wed, 28 Aug 2019 10:04:16 +0000
Subject: [PATCH] Solarized theme: add "solarized-" prefix

Since the site originally launched with only the Solarized themes,
they've always just been referred to internally as "light" and "dark".
This changes them to solarized-light and solarized-dark respectively.
---
 tildes/scss/themes/_solarized.scss  | 4 ++--
 tildes/tildes/templates/base.jinja2 | 6 +++---
 tildes/tildes/views/settings.py     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tildes/scss/themes/_solarized.scss b/tildes/scss/themes/_solarized.scss
index 4cf6d84..152c685 100644
--- a/tildes/scss/themes/_solarized.scss
+++ b/tildes/scss/themes/_solarized.scss
@@ -64,7 +64,7 @@ $solarized-dark: (
   "foreground-secondary": $fg-darkest,
 );
 
-body.theme-dark {
+body.theme-solarized-dark {
   @include use-theme(map-merge($solarized-base, $solarized-dark));
 }
 
@@ -81,6 +81,6 @@ $solarized-light: (
   "warning": $orange,
 );
 
-body.theme-light {
+body.theme-solarized-light {
   @include use-theme(map-merge($solarized-base, $solarized-light));
 }
diff --git a/tildes/tildes/templates/base.jinja2 b/tildes/tildes/templates/base.jinja2
index db7f7ba..930e84b 100644
--- a/tildes/tildes/templates/base.jinja2
+++ b/tildes/tildes/templates/base.jinja2
@@ -20,7 +20,7 @@
   {% endblock %}
 
   {# Hardcoding each option isn't great, but I don't know a better method #}
-  {% if request.cookies.get('theme', '') == 'dark' %}
+  {% if request.cookies.get('theme', '') == 'solarized-dark' %}
   <meta name="theme-color" content="#073642">
   {% elif request.cookies.get("theme", "") == "dracula" %}
   <meta name="theme-color" content="#282a36">
@@ -115,8 +115,8 @@
       <select class="form-select" name="theme" id="theme" data-js-theme-selector>
         {% for (theme, description) in (
             ("white", "White"),
-            ("light", "Solarized Light"),
-            ("dark", "Solarized Dark"),
+            ("solarized-light", "Solarized Light"),
+            ("solarized-dark", "Solarized Dark"),
             ("dracula", "Dracula"),
             ("atom-one-dark", "Atom One Dark"),
             ("black", "Black"),
diff --git a/tildes/tildes/views/settings.py b/tildes/tildes/views/settings.py
index a9c928d..29ef6b3 100644
--- a/tildes/tildes/views/settings.py
+++ b/tildes/tildes/views/settings.py
@@ -34,8 +34,8 @@ def get_settings(request: Request) -> dict:
 
     theme_options = {
         "white": "White",
-        "light": "Solarized Light",
-        "dark": "Solarized Dark",
+        "solarized-light": "Solarized Light",
+        "solarized-dark": "Solarized Dark",
         "dracula": "Dracula",
         "atom-one-dark": "Atom One Dark",
         "black": "Black",