Resolve merge conflicts

aleksis/core/preferences.py

@@ -198,6 +198,21 @@ class NotificationChannels(ChoicePreference):
     choices = get_notification_choices_lazy()
 
 
+@person_preferences_registry.register
+class Design(ChoicePreference):
+    """Change design (on supported pages)."""
+
+    section = theme
+    name = "design"
+    default = "light"
+    verbose_name = _("Select Design")
+    choices = [
+        # ("system", _("System Design")),
+        ("light", _("Light mode")),
+        # ("dark", _("Dark mode")),
+    ]
+
+
 @site_preferences_registry.register
 class PrimaryGroupPattern(StringPreference):
     """Regular expression to match primary group."""

aleksis/core/static/js/vue/app.js

@@ -7,11 +7,16 @@ const vuetify = new Vuetify({
         iconfont: 'mdi', // default - only for display purposes
     },
     theme: {
+        dark: JSON.parse(document.getElementById("design-mode").textContent) === "dark",
         themes: {
             light: {
                 primary: JSON.parse(document.getElementById("primary-color").textContent),
                 secondary: JSON.parse(document.getElementById("secondary-color").textContent),
             },
+            dark: {
+                primary: JSON.parse(document.getElementById("primary-color").textContent),
+                secondary: JSON.parse(document.getElementById("secondary-color").textContent),
+            },
         },
     },
 })

aleksis/core/static/public/vue_style.scss

@@ -2,24 +2,7 @@
 // HEADINGS //
 //////////////
 
-h1 {
-  font-weight: 300;
-  font-style: normal;
-  font-size: 3.6rem;
-  line-height: 110%;
-  margin: 1.4rem 0 1.68rem 0;
-}
-
-h2 {
-  font-weight: 300;
-  font-size: 3.0rem;
-}
-
 p, h1, h2, h3, h4, h5, h6, .card-title {
   overflow-wrap: break-word;
   hyphens: auto;
 }
-
-a.v-toolbar__title {
-  text-decoration: none;
-}

aleksis/core/templates/core/vue_base.html

@@ -95,7 +95,7 @@
     <v-app-bar app color="primary white--text">
       <v-app-bar-nav-icon @click="drawer = !drawer" color="white"></v-app-bar-nav-icon>
 
-      <v-toolbar-title tag="a" class="white--text" href="{% url "index" %}">
+      <v-toolbar-title tag="a" class="white--text text-decoration-none" href="{% url "index" %}">
         {{ request.site.preferences.general__title }}
       </v-toolbar-title>
 
@@ -153,7 +153,7 @@
       {% endif %}
     </v-app-bar>
     <v-main>
-      <v-container fluid>
+      <v-container>
         {% include 'core/partials/vue_no_person.html' %}
 
         {% if messages %}
@@ -164,7 +164,7 @@
           {% endfor %}
         {% endif %}
         {% block no_page_title %}
-          <h1>{% block page_title %}{% endblock %}</h1>
+          <h1 class="text-h2">{% block page_title %}{% endblock %}</h1>
         {% endblock %}
         {% block content %}{% endblock %}
       </v-container>
@@ -216,6 +216,7 @@
 {% include_js "sortablejs" %}
 {# Fixme: das muss weg ↓ #}
 {% include_js "jquery-sortablejs" %}
+{{ request.user.person.preferences.theme__design|json_script:"design-mode" }}
 {{ request.site.preferences.theme__primary|json_script:"primary-color" }}
 {{ request.site.preferences.theme__secondary|json_script:"secondary-color" }}
 {{ get_current_language|json_script:"current-language" }}