majak: Logo and favicon

home/templates/home/base.html

@@ -26,11 +26,11 @@
   <title>{{ page.title }}</title>
 
   <!-- Favicon -->
-  <link rel="icon" type="image/png" href="{% static "home/favicon/favicon-196.png" %}" sizes="196x196">
-  <link rel="icon" type="image/png" href="{% static "home/favicon/favicon-128.png" %}" sizes="128x128">
-  <link rel="icon" type="image/png" href="{% static "home/favicon/favicon-96.png" %}" sizes="96x96">
-  <link rel="icon" type="image/png" href="{% static "home/favicon/favicon-32.png" %}" sizes="32x32">
-  <link rel="icon" type="image/png" href="{% static "home/favicon/favicon-16.png" %}" sizes="16x16">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-196.png" %}" sizes="196x196">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-128.png" %}" sizes="128x128">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-96.png" %}" sizes="96x96">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-32.png" %}" sizes="32x32">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-16.png" %}" sizes="16x16">
 
   <!-- Bootstrap CSS -->
   <link rel="stylesheet" href="{% static "home/vendor/bootstrap-4.4.1/css/bootstrap.min.css" %}">
@@ -48,9 +48,19 @@
     <div class="container">
 
       <div class="brand-wrapper">
-        <a class="navbar-brand navbar-brand--primary" href="/">{{ page.title }}</a>
+        <a class="navbar-brand navbar-brand--primary" href="/">
+          <img src="{% static "majak/img/majak-pruhledny.svg" %}" width="50" height="50" class="mr-2"> MAJÁK
+        </a>
       </div>
 
+      <!-- Navigation -->
+        <ul class="navbar-nav ml-auto">
+          <li class="nav-item">
+            <a class="nav-link" href="/admin/">správa webů</a>
+          </li>
+        </ul>
+      <!-- /navigation -->
+
     </div><!-- /container -->
   </nav>
   <!-- /HEADER -->

majak/static/majak/img/majak-pruhledny.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="majak-white.svg"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
+   id="svg133"
+   version="1.1"
+   viewBox="0 0 100.00003 99.999924"
+   height="99.999924mm"
+   width="100.00003mm">
+  <defs
+     id="defs127" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="23"
+     inkscape:window-x="1280"
+     inkscape:window-height="1035"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="162.60565"
+     inkscape:cx="260.15903"
+     inkscape:zoom="0.98994949"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata130">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-47.517842,-46.005989)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Vrstva 1">
+    <path
+       transform="matrix(0.26458333,0,0,0.26458333,47.517842,46.005989)"
+       d="M 187.54492 26.154297 C 183.8216 26.143543 180.08856 26.866723 177.10156 29.025391 C 173.21742 31.830934 171.24426 36.489984 168.95508 40.701172 C 166.67164 44.912359 163.43507 49.208375 158.73047 50.097656 C 158.73047 50.315667 158.58008 50.281845 158.58008 50.494141 L 158.58203 53.730469 C 167.01015 53.730469 189.0625 53.804687 189.0625 53.804688 L 189.21289 53.804688 C 189.21289 53.804688 211.26719 53.730469 219.69531 53.730469 L 219.69531 50.494141 C 219.69531 50.281875 219.54492 50.315659 219.54492 50.097656 C 214.83461 49.208375 211.59985 44.912359 209.31641 40.701172 C 207.03297 36.489984 205.05407 31.830934 201.16992 29.025391 C 197.75622 26.558304 193.3728 25.968038 189.13867 26.203125 C 188.6094 26.17372 188.07682 26.155833 187.54492 26.154297 z M 63.371094 50.322266 A 187.08662 187.08662 0 0 0 29.640625 90.929688 L 154.12305 77.775391 L 154.12305 64.171875 L 63.371094 50.322266 z M 315.09375 50.789062 L 223.94531 63.958984 L 223.94531 78.009766 L 348.0625 90.523438 A 187.08662 187.08662 0 0 0 315.09375 50.789062 z M 165.60938 62.232422 L 165.60938 83.597656 L 213.20117 83.597656 L 213.20117 62.232422 L 165.60938 62.232422 z M 146.18359 91.183594 L 146.18359 105.93945 L 233.60156 105.93945 L 233.60156 91.183594 L 146.18359 91.183594 z M 154.12305 113.58789 L 154.92578 117.71289 L 223.88867 117.71289 L 223.0918 113.58789 L 154.12305 113.58789 z M 159.83789 125.36523 L 145.97656 279.65234 C 104.94615 285.1141 48.073976 281.30191 8.8964844 239.69531 A 187.08662 187.08662 0 0 0 43.619141 306.75781 C 51.895278 309.62073 60.683626 311.52639 69.158203 312.9668 C 93.006946 317.02692 117.36919 316.98289 141.28906 313.3457 C 163.85757 309.91635 185.30545 303.68857 206.75781 295.88672 C 228.21018 288.08487 250.4228 281.03356 273.25391 281.12109 C 295.81038 281.20216 319.93142 289.52658 334.07031 307.08203 A 187.08662 187.08662 0 0 0 341.41406 297.4375 C 324.85716 278.69564 299.8073 268.6944 274.83008 266.10156 C 260.75644 264.64546 246.63648 265.32956 232.58008 267.10352 L 219.08594 125.36523 L 159.83789 125.36523 z M 212.28125 137.02148 L 212.28125 169.09961 L 164.68945 190.4668 L 164.68945 156.44727 L 212.28125 137.02148 z M 217.14062 206.46484 L 217.14062 239.00391 L 159.83398 265.10742 L 159.83398 229.29297 L 217.14062 206.46484 z M 243.22852 303.73047 C 200.85711 303.8006 150.40713 345.01281 86.349609 345.40039 A 187.08662 187.08662 0 0 0 116.60156 361.49609 C 136.91285 355.93793 156.72244 348.17122 174.66406 337.17773 C 213.17548 313.57795 243.51843 305.35926 254.01758 304.68359 C 250.47928 304.02475 246.8835 303.72442 243.22852 303.73047 z M 284.19336 316.44336 C 261.42684 316.16882 232.3631 322.15293 207.92773 347.26172 C 227.30654 339.26125 246.83885 331.19014 267.79883 330.63867 C 279.95311 330.32439 292.37854 332.28822 303.60742 336.82812 A 187.08662 187.08662 0 0 0 320.28906 322.23438 C 315.01065 320.43639 301.4237 316.65114 284.19336 316.44336 z "
+       style="fill:#ffffff;stroke-width:0"
+       id="path131" />
+  </g>
+</svg>

majak/static/majak/img/majak.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="4.0599999"
+   inkscape:export-xdpi="4.0599999"
+   inkscape:export-filename="/Users/honza/Piráti/grafika/maják/favicon-16.png"
+   sodipodi:docname="maják.svg"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
+   id="svg93"
+   version="1.1"
+   viewBox="0 0 99.999998 100"
+   height="100mm"
+   width="100mm">
+  <defs
+     id="defs87" />
+  <sodipodi:namedview
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="23"
+     inkscape:window-x="1280"
+     inkscape:window-height="1035"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="140.14996"
+     inkscape:cx="198.65862"
+     inkscape:zoom="0.98994949"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-109.26204,111.47614)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Vrstva 1">
+    <circle
+       r="49.5"
+       cy="-61.476139"
+       cx="159.26204"
+       id="path131"
+       style="fill:#ffffff;stroke-width:0" />
+    <g
+       style="fill:#000000"
+       transform="matrix(0.13148178,0,0,-0.13148168,-38.171403,108.58766)"
+       id="g70">
+      <g
+         style="fill:#000000"
+         id="g44"
+         transform="scale(0.110097)">
+        <path
+           d="m 15769.8,9030.86 c -587.1,-461.05 -1326.6,-736.72 -2130.9,-736.72 -489.6,0 -955.1,102.46 -1377.1,286.12 390.2,102.45 771.6,248.42 1115.5,459.14 703.9,431.35 1258.5,581.58 1450.4,593.93 -827.8,154.14 -1825,-766.05 -3127.6,-743.89 -295.9,201 -558.3,447.24 -778.7,728.09 168.5,-64.95 351.7,-105.73 527.5,-135.61 435.9,-74.21 881.2,-73.39 1318.4,-6.91 412.5,62.68 804.5,176.49 1196.6,319.09 392.1,142.6 798.1,271.5 1215.4,269.9 417.1,-1.5 863.6,-157.09 1120.7,-485.71 0,0 -103.1,-133.07 -225.3,-278.76 -108.2,44.69 -1248.7,419.45 -2089.4,-444.42 354.2,146.23 711.2,293.74 1094.3,303.82 235.1,6.08 475.8,-34.42 690.2,-128.07"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path46" />
+      </g>
+      <path
+         d="m 1452.73,1358.9 v -68.46 l 95.77,43 v 64.55 l -95.77,-39.09"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
+         id="path48" />
+      <path
+         d="m 1442.96,1140.24 115.32,52.53 v 65.48 l -115.32,-45.94 v -72.07"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
+         id="path50" />
+      <g
+         style="fill:#000000"
+         id="g52"
+         transform="scale(0.115453)">
+        <path
+           d="m 13784,12650.5 h -1523.7 v 257.2 H 13784 Z m -1371.3,-205.2 -14,71.9 h 1202.1 l 13.9,-71.9 z m 1015.7,967 v -372.4 h -829.5 v 372.4 z m -952,204.6 c 0,3.7 2.6,3.1 2.6,6.9 82,15.5 138.4,90.4 178.2,163.8 39.9,73.4 74.3,154.6 142,203.5 59.5,43 136,53.3 209.8,49.2 73.8,4.1 150.2,-6.2 209.7,-49.2 67.7,-48.9 102.2,-130.1 142,-203.5 39.8,-73.4 96.2,-148.3 178.3,-163.8 0,-3.8 2.6,-3.2 2.6,-6.9 v -56.4 c -146.9,0 -531.3,-1.3 -531.3,-1.3 h -2.6 c 0,0 -384.4,1.3 -531.3,1.3 z m 3344.2,-701.9 -2204.9,222.3 v 244.9 l 1629.9,235.5 c -587.7,545.4 -1374.4,879.3 -2239.4,879.3 -860.6,0 -1643.8,-330.4 -2230.5,-870.8 l 1623,-247.7 v -237.1 l -2211.5,-233.7 c -301.34,-497.3 -474.83,-1080.6 -474.83,-1704.5 0,-286.7 36.73,-564.7 105.59,-829.9 683.74,-776.13 1706.14,-848.1 2438.74,-750.58 l 241.6,2689.18 H 13531 l 235.2,-2470.47 c 245,30.92 491.1,42.87 736.4,17.49 446.4,-46.34 894.2,-228.4 1182.3,-571.31 386.7,539.87 615.1,1200.79 615.1,1915.59 0,627 -175.3,1213 -479.4,1711.8"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path54" />
+      </g>
+    </g>
+  </g>
+</svg>

majak/templates/wagtailadmin/admin_base.html

+{% extends "wagtailadmin/admin_base.html" %}
+{% load static %}
+
+{% block branding_title %}Maják{% endblock %}
+
+{% block branding_favicon %}
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-196.png" %}" sizes="196x196">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-128.png" %}" sizes="128x128">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-96.png" %}" sizes="96x96">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-32.png" %}" sizes="32x32">
+  <link rel="icon" type="image/png" href="{% static "majak/img/favicon-16.png" %}" sizes="16x16">
+{% endblock %}

majak/templates/wagtailadmin/base.html

+{% extends "wagtailadmin/base.html" %}
+{% load static %}
+
+{% block branding_logo %}
+  <img src="{% static "majak/img/majak-pruhledny.svg" %}" alt="Maják" width="80" />
+{% endblock %}