styling changes

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748162331,
+        "lastModified": 1756886854,
-        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
+        "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+        "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -66,7 +66,7 @@
 
           nixos-shell.mounts.extraMounts = {
             "/var/lib/froide-govplan/templates" = {
-               target = /home/onny/projects/froide-govplan/froide_govplan/templates;
+               target = /home/onny/projects/verwaltungstracker/froide_govplan/templates;
                cache = "none";
             };
           };

froide_govplan/static/froide_govplan/images/logo.svg

@@ -1,32 +1,58 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+<svg
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+   version="1.0"
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+   width="451.27914pt"
- width="640.000000pt" height="640.000000pt" viewBox="0 0 640.000000 640.000000"
+   height="368.35001pt"
- preserveAspectRatio="xMidYMid meet">
+   viewBox="0 0 451.27914 368.35001"
-<metadata>
+   preserveAspectRatio="xMidYMid"
+   id="svg3"
+   sodipodi:docname="logo.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     id="namedview3"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="pt">
+    <inkscape:page
+       x="9.9261674e-24"
+       y="0"
+       width="451.27914"
+       height="368.35001"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1">
 Created by potrace 1.16, written by Peter Selinger 2001-2019
 </metadata>
-<g transform="translate(0.000000,640.000000) scale(0.100000,-0.100000)"
+  <g
-fill="#000000" stroke="none">
+     transform="matrix(0.1,0,0,-0.1,-98.999998,504.35001)"
-<path d="M990 5042 c0 -10 668 -1325 1170 -2302 103 -201 249 -486 325 -635
+     fill="#000000"
-76 -148 192 -377 259 -507 l121 -238 132 0 132 0 44 83 c25 45 109 208 187
+     stroke="none"
-362 78 154 176 344 216 421 41 78 74 144 74 146 0 3 -60 8 -132 11 -140 5
+     id="g3"
--238 28 -371 83 -327 137 -587 446 -678 805 -27 108 -37 337 -19 447 16 98 53
+     style="fill:#d0d9e3;fill-opacity:1">
-227 84 292 l25 51 -247 489 -247 489 -538 3 c-295 2 -537 2 -537 0z"/>
+    <path
-<path d="M3850 4880 c-44 -88 -80 -162 -80 -165 0 -3 15 -5 33 -5 117 0 387
+       d="m 990,5042 c 0,-10 668,-1325 1170,-2302 103,-201 249,-486 325,-635 76,-148 192,-377 259,-507 l 121,-238 h 132 132 l 44,83 c 25,45 109,208 187,362 78,154 176,344 216,421 41,78 74,144 74,146 0,3 -60,8 -132,11 -140,5 -238,28 -371,83 -327,137 -587,446 -678,805 -27,108 -37,337 -19,447 16,98 53,227 84,292 l 25,51 -247,489 -247,489 -538,3 c -295,2 -537,2 -537,0 z"
--109 517 -209 66 -50 205 -189 251 -250 l26 -35 210 412 210 412 -544 0 -543
+       id="path1"
-0 -80 -160z"/>
+       style="fill:#d0d9e3;fill-opacity:1" />
-<path d="M3431 4609 c-74 -13 -218 -62 -293 -100 -273 -138 -477 -392 -557
+    <path
--692 -149 -557 191 -1143 755 -1304 92 -26 112 -28 274 -28 161 0 183 3 275
+       d="m 3850,4880 c -44,-88 -80,-162 -80,-165 0,-3 15,-5 33,-5 117,0 387,-109 517,-209 66,-50 205,-189 251,-250 l 26,-35 210,412 210,412 h -544 -543 z"
-29 100 28 241 88 293 124 l27 20 92 -87 c91 -86 92 -88 81 -117 -6 -17 -8 -43
+       id="path2"
--4 -59 11 -42 724 -757 783 -785 62 -29 136 -27 202 6 101 51 148 159 117 268
+       style="fill:#d0d9e3;fill-opacity:1" />
--16 53 -31 72 -210 259 -304 316 -528 535 -557 542 -15 4 -40 5 -55 3 -23 -2
--35 4 -58 32 -16 19 -56 63 -89 96 l-59 62 45 63 c243 344 254 817 26 1187
--99 161 -283 324 -457 404 -141 64 -222 81 -407 84 -93 1 -194 -2 -224 -7z
-m397 -325 c251 -72 427 -242 515 -498 28 -84 31 -102 31 -226 1 -157 -13 -221
--74 -345 -48 -96 -107 -170 -198 -247 -144 -123 -292 -177 -488 -178 -208 0
--389 75 -539 225 -151 151 -220 321 -219 535 1 126 17 203 64 306 88 194 271
-359 475 429 111 38 297 37 433 -1z"/>
   </g>
+  <path
+     style="fill:#4a80ff;fill-opacity:1;stroke-width:1.31147"
+     d="m 420.75275,343.52243 c -5.83526,-3.27992 -38.20704,-34.29898 -60.6912,-58.15509 -18.32936,-19.44779 -18.66159,-19.90538 -17.89077,-24.64048 0.75445,-4.63459 0.4203,-5.1655 -8.48064,-13.47439 l -9.26605,-8.64971 -8.08422,4.37936 c -4.44632,2.40865 -13.69079,6.22615 -20.54324,8.48333 -11.64385,3.83545 -13.70321,4.10411 -31.47541,4.10612 -16.03493,0.002 -20.45572,-0.45525 -28.19672,-2.91535 -34.55542,-10.98177 -61.0916,-37.22892 -72.29559,-71.50814 -5.01411,-15.34098 -5.86127,-38.98887 -1.95148,-54.47477 8.83875,-35.0086 33.57583,-63.63031 65.45743,-75.73667 16.83735,-6.39362 22.44591,-7.25054 42.74279,-6.53051 21.53188,0.76383 32.39378,3.72546 48.04886,13.10112 33.64963,20.15238 52.73208,54.05633 52.61243,93.47689 -0.0667,21.99484 -5.27874,39.30116 -17.49127,58.07966 l -5.36118,8.24358 3.10362,3.5597 c 11.58805,13.29087 14.88298,16.01869 19.34884,16.01869 3.92632,0 6.35204,1.81475 19.72143,14.75411 28.38275,27.46981 57.01756,57.94523 59.45682,63.27868 2.84789,6.22689 2.21997,13.50841 -1.71378,19.87334 -5.52588,8.94105 -18.96147,13.27735 -27.05067,8.73053 z M 291.20646,222.45529 c 23.50199,-8.99012 42.36666,-29.68019 48.48736,-53.17908 2.65483,-10.19261 2.60885,-30.84152 -0.0891,-40.02125 -6.0326,-20.52564 -21.24475,-39.20765 -38.70794,-47.53713 -14.36143,-6.85003 -19.72884,-7.99455 -37.23127,-7.93899 -12.91542,0.041 -17.03816,0.55674 -22.98934,2.87589 -22.21155,8.65575 -41.00234,28.03218 -48.55388,50.06712 -4.17982,12.19644 -4.3082,33.68436 -0.27848,46.61183 7.37511,23.65959 30.14817,45.08605 54.4737,51.2526 10.87176,2.756 35.12306,1.60473 44.88898,-2.13099 z"
+     id="path4" />
 </svg>

froide_govplan/templates/froide_govplan/base.html

@@ -71,7 +71,7 @@
 <div class="col-lg-10 mx-auto p-4 py-md-5">
     <header class="d-flex align-items-center pb-3 mb-5 border-bottom">
         <a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none text-reset">
-            <img src="{% static 'froide_govplan/images/apple-touch-icon.png' %}" class="bi me-2" height="50">
+            <img src="{% static 'froide_govplan/images/logo.svg' %}" class="bi me-2" height="50">
             <span class="fs-4">VerwaltungsTracker</span>
         </a>
         <div style="margin-left: auto; max-width: 350px;" class="search">
@@ -135,7 +135,7 @@
                         <div class="mt-4">
                             {% include "froide_govplan/plugins/progress_row.html" with object_list=plans %}
                             <p class="small text-body-secondary mt-3 no-hyphens">
-                                <span class="text-nowrap me-1"><i class="fa fa-circle text-light"></i>&nbsp;nicht begonnen</span>
+                                <span class="text-nowrap me-1"><i class="fa fa-circle" style="color: #d4d8da;"></i>&nbsp;nicht begonnen</span>
                                 <span class="text-nowrap me-1"><i class="fa fa-circle text-primary"></i>&nbsp;begonnen</span>
                                 <span class="text-nowrap me-1"><i class="fa fa-circle text-warning"></i>&nbsp;teilweise umgesetzt</span>
                                 <span class="text-nowrap me-1"><i class="fa fa-circle text-success"></i>&nbsp;umgesetzt</span>
@@ -193,7 +193,7 @@
         <div class="row g-4">
             <div class="col-12 col-md-6 col-lg-8">
                 <a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none text-reset mb-3">
-                    <img src="{% static 'froide_govplan/images/apple-touch-icon.png' %}" class="bi me-2" height="35">
+                    <img src="{% static 'froide_govplan/images/logo.svg' %}" class="bi me-2" height="35">
                     <span class="fs-6">VerwaltungsTracker</span>
                 </a>
                 <p style="max-width: 300px;">

froide_govplan/templates/froide_govplan/plugins/progress.html

@@ -7,7 +7,7 @@
   <div class="flex-grow-1 ms-2">
     <div class="progress" {% if "progress-lg" in instance.extra_classes %}style="height: 1.5rem;"{% endif %}>
       {% for section in progress.sections %}
-        <div class="progress-bar bg-{{ section.css_class }}" role="progressbar" style="width: {{ section.css_percentage }}%;" aria-valuenow="{{ section.css_percentage }}" aria-valuemin="0" aria-valuemax="100" aria-label="{{ section.percentage }}% {{ section.label }}" title="{{ section.percentage }}% {{ section.label }}" data-bs-toggle="tooltip" data-placement="top">
+        <div class="progress-bar {% if section.css_class == 'light' %}bg-dark bg-opacity-10{% else %}bg-{{ section.css_class }}{% endif %}" role="progressbar" style="width: {{ section.css_percentage }}%;" aria-valuenow="{{ section.css_percentage }}" aria-valuemin="0" aria-valuemax="100" aria-label="{{ section.percentage }}% {{ section.label }}" title="{{ section.percentage }}% {{ section.label }}" data-bs-toggle="tooltip" data-placement="top">
         </div>
       {% endfor %}
     </div>

froide_govplan/templates/froide_govplan/plugins/progress_row.html

@@ -9,7 +9,7 @@
   <div class="col-sm-10">
     <div class="progress" {% if "progress-lg" in instance.extra_classes %}style="height: 1.5rem;"{% endif %}>
       {% for section in progress.sections %}
-        <div class="progress-bar bg-{{ section.css_class }}" role="progressbar" style="width: {{ section.css_percentage }}%;" aria-valuenow="{{ section.css_percentage }}" aria-valuemin="0" aria-valuemax="100" aria-label="{{ section.percentage }}% {{ section.label }}" title="{{ section.percentage }}% {{ section.label }}" data-bs-toggle="tooltip" data-placement="top">
+        <div class="progress-bar {% if section.css_class == 'light' %}bg-dark bg-opacity-10{% else %}bg-{{ section.css_class }}{% endif %}" role="progressbar" style="width: {{ section.css_percentage }}%;" aria-valuenow="{{ section.css_percentage }}" aria-valuemin="0" aria-valuemax="100" aria-label="{{ section.percentage }}% {{ section.label }}" title="{{ section.percentage }}% {{ section.label }}" data-bs-toggle="tooltip" data-placement="top">
         </div>
       {% endfor %}
     </div>

froide_govplan/templates/froide_govplan/plugins/sections.html

@@ -113,10 +113,10 @@
             <div class="col-md-5  d-flex align-items-center justify-content-center order-1 order-md-2 mb-4">
               <img src="{% static 'froide_govplan/images/teaser_image_1.webp' %}" height="250px">
           </div>
-            <div class="col-md-7 order-2 order-md-1">
+            <div class="col-md-7 order-2 order-md-1 mb-4">
-                <h2 class="featurette-heading fw-normal lh-1">We’re watching you! <span class="text-body-secondary">Karlsruhe.</span></h2>
+                <h2 class="featurette-heading fw-normal lh-1 mb-4">We’re watching you! <span class="text-body-secondary">Karlsruhe.</span></h2>
                 <p class="lead">
-                    Wir haben die Verwaltungsvorhaben der Stadt Karlsruhe genau unter die Lupe genommen und rund 250 überprüfbare Projekte identifiziert, die die Stadtverwaltung plant: Es geht um Klimaschutz und Digitalisierung, um Vorhaben im Bereich Wohnen und Mobilität, um moderne Verwaltungsprozesse und Maßnahmen zur Gleichstellung.
+                    Wir haben die Verwaltungsvorhaben der Stadt Karlsruhe genau unter die Lupe genommen und rund 60 überprüfbare Projekte identifiziert, die die Stadtverwaltung plant: Es geht um Klimaschutz und Digitalisierung, um Vorhaben im Bereich Wohnen und Mobilität, um moderne Verwaltungsprozesse und Maßnahmen zur Gleichstellung.
                 </p>
             </div>
         </div>

froide_govplan/templates/froide_govplan/section.html

@@ -40,7 +40,7 @@ Hier finden Sie alle Vorhaben aus dem Bereich „{{ section }}“, welche die St
                 <div class="mt-5">
                     {% include "froide_govplan/plugins/progress_row.html" with object_list=plans %}
                     <p class="small text-body-secondary mt-3 no-hyphens">
-                        <span class="text-nowrap me-1"><i class="fa fa-circle text-light"></i>&nbsp;nicht begonnen</span>
+                        <span class="text-nowrap me-1"><i class="fa fa-circle" style="color: #d4d8da;"></i>&nbsp;nicht begonnen</span>
                         <span class="text-nowrap me-1"><i class="fa fa-circle text-primary"></i>&nbsp;begonnen</span>
                         <span class="text-nowrap me-1"><i class="fa fa-circle text-warning"></i>&nbsp;teilweise umgesetzt</span>
                         <span class="text-nowrap me-1"><i class="fa fa-circle text-success"></i>&nbsp;umgesetzt</span>