Merge branch '38c3-design' into 'develop'

38c3 Design - Runde 1

See merge request !1051

Development.md

@@ -105,7 +105,7 @@ DATABASES = {
 Sämtliche Hub-Komponenten müssen eigene Variablen definieren. Alle Variablen sind in [`_variables-hub.scss`](./src/plainui/styles/_variables-hub.scss) enthalten.
 Gegebenenfalls müssen neue Variablen hinzugefügt werden. Ein neues Theme kann dann Variablen aus Bootstrap oder dem Hub überschreiben.
 
-Als Beispiel kann das [`hub-high-contrast.scss`](./src/plainui/styles/hub-high-contrast.scss) genommen werden.
+Als Beispiel kann das [`hub-high-contrast.scss`](./src/plainui/styles/themes/hub-high-contrast.scss) genommen werden.
 
 ### CSS Kompilieren (PlainUi)
 

Dockerfile

@@ -122,7 +122,7 @@ CMD ["watch"]
 
 FROM build AS build-static
 
-COPY --from=node-build /app/plainui/static/plainui/hub.css /app/plainui/static/plainui/hub.css.map /app/plainui/static/plainui/
+COPY --from=node-build /app/plainui/static/plainui/*.css* /app/plainui/static/plainui/
 COPY /src/ /app
 
 WORKDIR /app
@@ -160,7 +160,7 @@ RUN install -o appuser -g appuser -m 774 /dev/null /data/django.log
 # Copy additional dev dependencies
 COPY --from=build-dev /install/.venv /install/.venv
 # Copy plainui styles
-COPY --from=node-build /app/plainui/static/hub.css* /app/plainui/static/
+COPY --from=node-build /app/plainui/static/*.css* /app/plainui/static/
 ENV PATH="/install/.venv/bin:$PATH"
 
 USER appuser

src/plainui/jinja2.py

@@ -198,6 +198,8 @@ def show_vars(ctx, var=_UNSET):
 def css_scope(ctx):
     request = ctx['request']
 
+    return '38c3'
+
     if (request.user.is_authenticated and request.user.high_contrast) or request.session.get('high_contrast', False):
         return 'hub-high-contrast'
 

src/plainui/jinja2/plainui/base.html.j2

@@ -108,7 +108,9 @@
               </ul>
               <ul class="d-flex gap-2 list-unstyled">
                 <li>{{ hbtns.share() }}</li>
+                <!-- Temporary disabled due to 38c3 design implementation.
                 <li>{{ hbtns.themeswitcher() }}</li>
+                -->
                 <li>{{ hbtns.globe() }}</li>
               </ul>
             </div>

src/plainui/package.json

@@ -16,8 +16,8 @@
     "bootstrap-icons": "^1.11.3"
   },
   "scripts": {
-    "build": "sass --silence-deprecation slash-div,mixed-decls,color-functions,global-builtin,import -I node_modules --style=compressed styles:static/plainui",
-    "watch": "sass --silence-deprecation slash-div,mixed-decls,color-functions,global-builtin,import --watch -I node_modules styles:static/plainui"
+    "build": "sass --silence-deprecation slash-div,mixed-decls,color-functions,global-builtin,import -I node_modules --style=compressed styles/themes:static/plainui",
+    "watch": "sass --silence-deprecation slash-div,mixed-decls,color-functions,global-builtin,import --watch -I node_modules styles/themes:static/plainui"
   },
   "packageManager": "yarn@4.5.1"
 }