Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms

This commit is contained in:
sanghee 2020-01-25 20:53:52 +01:00
commit b3be0760d3
3 changed files with 117 additions and 2 deletions

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 106.3 28.3" style="enable-background:new 0 0 106.3 28.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#050505;}
</style>
<g>
<path class="st0" d="M29.8,24.9c0-0.4,0.1-0.8,0.4-1.2c0.3-0.4,0.7-0.8,1.3-1.1v-0.1c-0.3-0.2-0.5-0.4-0.8-0.7
c-0.2-0.3-0.3-0.7-0.3-1.1c0-0.3,0.1-0.7,0.3-1.1c0.2-0.4,0.5-0.7,0.9-0.9v-0.1c-0.4-0.3-0.7-0.6-1-1.1c-0.3-0.5-0.4-1-0.4-1.6
c0-0.6,0.1-1.1,0.3-1.6c0.2-0.5,0.5-0.9,0.9-1.2c0.4-0.3,0.8-0.6,1.4-0.8c0.5-0.2,1.1-0.3,1.6-0.3c0.6,0,1.1,0.1,1.6,0.3h4.4V14H38
c0.2,0.2,0.4,0.5,0.6,0.9c0.2,0.3,0.3,0.7,0.3,1.1c0,0.6-0.1,1.1-0.3,1.5c-0.2,0.5-0.5,0.8-0.9,1.1c-0.4,0.3-0.8,0.5-1.3,0.7
c-0.5,0.2-1.1,0.2-1.6,0.2c-0.3,0-0.5,0-0.8-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.5,0.3-0.7,0.7-0.7,1.1c0,0.4,0.2,0.7,0.5,0.9
c0.4,0.2,0.9,0.3,1.6,0.3h2.3c1.4,0,2.4,0.2,3.1,0.6c0.7,0.4,1,1.1,1,2c0,0.5-0.1,1-0.4,1.4c-0.3,0.5-0.7,0.8-1.2,1.2
c-0.5,0.3-1.2,0.6-1.9,0.8c-0.7,0.2-1.6,0.3-2.5,0.3c-1.5,0-2.7-0.2-3.6-0.7C30.2,26.6,29.8,25.9,29.8,24.9z M31.6,24.7
c0,0.5,0.3,0.9,0.8,1.2c0.6,0.3,1.4,0.5,2.4,0.5c0.6,0,1.1-0.1,1.5-0.2c0.5-0.1,0.9-0.3,1.2-0.4c0.3-0.2,0.6-0.4,0.8-0.6
c0.2-0.2,0.3-0.5,0.3-0.7c0-0.5-0.2-0.8-0.6-0.9c-0.4-0.2-1-0.2-1.7-0.2h-1.9c-0.3,0-0.6,0-0.9,0c-0.3,0-0.5-0.1-0.7-0.1
c-0.4,0.2-0.7,0.5-0.9,0.8C31.7,24.1,31.6,24.4,31.6,24.7z M34.6,18.3c0.6,0,1.1-0.2,1.6-0.6c0.4-0.4,0.7-1,0.7-1.7
c0-0.7-0.2-1.3-0.7-1.7c-0.4-0.4-1-0.6-1.6-0.6c-0.6,0-1.1,0.2-1.6,0.6c-0.4,0.4-0.7,1-0.7,1.7c0,0.7,0.2,1.3,0.7,1.7
C33.5,18.1,34,18.3,34.6,18.3z"/>
</g>
<path class="st0" d="M13.4,23.3h-1.8l-0.2-1.8h-0.1c-0.5,0.6-1.1,1.1-1.8,1.5c-0.6,0.4-1.4,0.6-2.2,0.6c-1.3,0-2.3-0.4-2.9-1.1
c-0.6-0.8-0.9-1.9-0.9-3.3v-5.5l-2.9-0.1l5.2-2l0,1.5v5.8c0,1,0.2,1.7,0.5,2.2c0.3,0.5,0.9,0.7,1.8,0.7c0.6,0,1.1-0.1,1.6-0.4
c0.5-0.3,1-0.7,1.5-1.4v-7.6h2.2L13.4,23.3L13.4,23.3z"/>
<path class="st0" d="M17.1,12.3h1.8l0.2,1.8h0.1c0.6-0.6,1.2-1.1,1.8-1.5c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2v-6.5c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4
c-0.5,0.3-1,0.7-1.6,1.3v7.6h-2.2L17.1,12.3L17.1,12.3L17.1,12.3z"/>
<path class="st0" d="M51.9,17.8c0-0.9,0.2-1.7,0.5-2.4c0.3-0.7,0.7-1.3,1.3-1.8c0.5-0.5,1.1-0.9,1.8-1.2c0.7-0.3,1.4-0.4,2.1-0.4
c0.8,0,1.5,0.1,2.2,0.4c0.6,0.3,1.2,0.6,1.6,1.1c0.4,0.5,0.8,1,1,1.6c0.2,0.6,0.3,1.3,0.3,2.1c0,0.2,0,0.4,0,0.6
c0,0.2,0,0.4-0.1,0.5h-8.3c0.1,1.1,0.5,1.9,1.2,2.5c0.7,0.6,1.6,0.9,2.8,0.9c0.6,0,1.2-0.1,1.7-0.2c0.5-0.2,1-0.4,1.5-0.7l0.8,1.4
c-0.6,0.4-1.2,0.7-1.9,0.9c-0.7,0.2-1.5,0.4-2.4,0.4c-0.8,0-1.6-0.1-2.3-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8
C52.1,19.5,51.9,18.7,51.9,17.8z M60.6,16.8c0-1-0.3-1.8-0.8-2.3c-0.5-0.5-1.2-0.8-2.2-0.8c-0.8,0-1.6,0.3-2.2,0.8
c-0.6,0.5-1,1.3-1.2,2.3H60.6z"/>
<path class="st0" d="M70,11.9l0,11.6h-2.2v-8.5h-4.2L70,11.9z M68.7,9.7c-0.5,0-0.9-0.1-1.2-0.4C67.2,9,67,8.6,67,8.1
c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.4,1.2-0.4c0.5,0,0.9,0.1,1.2,0.4c0.3,0.3,0.5,0.7,0.5,1.2c0,0.5-0.2,0.9-0.5,1.2
C69.6,9.5,69.2,9.7,68.7,9.7z"/>
<path class="st0" d="M73.1,18c0-0.9,0.2-1.7,0.5-2.5c0.3-0.7,0.8-1.3,1.4-1.8c0.6-0.5,1.2-0.9,2-1.1c0.7-0.3,1.5-0.4,2.4-0.4
c0.9,0,1.7,0.2,2.4,0.5c0.7,0.3,1.2,0.7,1.7,1.1l-1.1,1.4c-0.4-0.4-0.9-0.6-1.4-0.8c-0.5-0.2-1-0.3-1.5-0.3c-0.6,0-1.1,0.1-1.6,0.3
c-0.5,0.2-0.9,0.5-1.3,0.8c-0.4,0.3-0.6,0.8-0.8,1.3c-0.2,0.5-0.3,1-0.3,1.6c0,0.6,0.1,1.1,0.3,1.6c0.2,0.5,0.5,0.9,0.8,1.3
c0.4,0.3,0.8,0.6,1.3,0.8c0.5,0.2,1,0.3,1.6,0.3c0.7,0,1.3-0.1,1.8-0.4c0.5-0.3,1-0.6,1.5-0.9l0.9,1.4c-0.6,0.5-1.3,1-2.1,1.3
c-0.8,0.3-1.5,0.4-2.3,0.4c-0.9,0-1.7-0.1-2.4-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8C73.2,19.8,73.1,19,73.1,18z"/>
<path class="st0" d="M83.7,7.6l4.7-2.3v6.5l-0.1,2.5c0.6-0.6,1.2-1.1,1.8-1.4c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2V17c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4c-0.5,0.3-1,0.7-1.6,1.3
v7.6h-2.2l0-16L83.7,7.6z"/>
<g>
<polygon class="st0" points="96.4,2.6 95.7,4.2 105,4.2 105.8,2.6 "/>
<polygon class="st0" points="95.7,6.1 94.9,7.7 104.3,7.7 105,6.1 "/>
<polygon class="st0" points="97.5,9.6 101.8,0.4 103.5,0.5 99.2,9.6 "/>
</g>
<g>
<path class="st0" d="M46.3,19.7c0,0.7,0.2,1.3,0.6,1.6c0.4,0.3,0.9,0.5,1.4,0.5c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,1-0.3l0.5,1.6
c-0.2,0.1-0.5,0.2-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.1c-0.3,0-0.5,0.1-0.8,0.1c-1.2,0-2.1-0.3-2.7-1
c-0.6-0.7-0.9-1.7-0.9-3V5.1h-3.5l5.6-4"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 106.3 28.3" style="enable-background:new 0 0 106.3 28.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M29.8,24.9c0-0.4,0.1-0.8,0.4-1.2c0.3-0.4,0.7-0.8,1.3-1.1v-0.1c-0.3-0.2-0.5-0.4-0.8-0.7
c-0.2-0.3-0.3-0.7-0.3-1.1c0-0.3,0.1-0.7,0.3-1.1c0.2-0.4,0.5-0.7,0.9-0.9v-0.1c-0.4-0.3-0.7-0.6-1-1.1c-0.3-0.5-0.4-1-0.4-1.6
c0-0.6,0.1-1.1,0.3-1.6c0.2-0.5,0.5-0.9,0.9-1.2c0.4-0.3,0.8-0.6,1.4-0.8c0.5-0.2,1.1-0.3,1.6-0.3c0.6,0,1.1,0.1,1.6,0.3h4.4V14H38
c0.2,0.2,0.4,0.5,0.6,0.9c0.2,0.3,0.3,0.7,0.3,1.1c0,0.6-0.1,1.1-0.3,1.5c-0.2,0.5-0.5,0.8-0.9,1.1c-0.4,0.3-0.8,0.5-1.3,0.7
c-0.5,0.2-1.1,0.2-1.6,0.2c-0.3,0-0.5,0-0.8-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.5,0.3-0.7,0.7-0.7,1.1c0,0.4,0.2,0.7,0.5,0.9
c0.4,0.2,0.9,0.3,1.6,0.3h2.3c1.4,0,2.4,0.2,3.1,0.6c0.7,0.4,1,1.1,1,2c0,0.5-0.1,1-0.4,1.4c-0.3,0.5-0.7,0.8-1.2,1.2
c-0.5,0.3-1.2,0.6-1.9,0.8c-0.7,0.2-1.6,0.3-2.5,0.3c-1.5,0-2.7-0.2-3.6-0.7C30.2,26.6,29.8,25.9,29.8,24.9z M31.6,24.7
c0,0.5,0.3,0.9,0.8,1.2c0.6,0.3,1.4,0.5,2.4,0.5c0.6,0,1.1-0.1,1.5-0.2c0.5-0.1,0.9-0.3,1.2-0.4c0.3-0.2,0.6-0.4,0.8-0.6
c0.2-0.2,0.3-0.5,0.3-0.7c0-0.5-0.2-0.8-0.6-0.9c-0.4-0.2-1-0.2-1.7-0.2h-1.9c-0.3,0-0.6,0-0.9,0c-0.3,0-0.5-0.1-0.7-0.1
c-0.4,0.2-0.7,0.5-0.9,0.8C31.7,24.1,31.6,24.4,31.6,24.7z M34.6,18.3c0.6,0,1.1-0.2,1.6-0.6c0.4-0.4,0.7-1,0.7-1.7
c0-0.7-0.2-1.3-0.7-1.7c-0.4-0.4-1-0.6-1.6-0.6c-0.6,0-1.1,0.2-1.6,0.6c-0.4,0.4-0.7,1-0.7,1.7c0,0.7,0.2,1.3,0.7,1.7
C33.5,18.1,34,18.3,34.6,18.3z"/>
</g>
<path class="st0" d="M13.4,23.3h-1.8l-0.2-1.8h-0.1c-0.5,0.6-1.1,1.1-1.8,1.5c-0.6,0.4-1.4,0.6-2.2,0.6c-1.3,0-2.3-0.4-2.9-1.1
c-0.6-0.8-0.9-1.9-0.9-3.3v-5.5l-2.9-0.1l5.2-2l0,1.5v5.8c0,1,0.2,1.7,0.5,2.2c0.3,0.5,0.9,0.7,1.8,0.7c0.6,0,1.1-0.1,1.6-0.4
c0.5-0.3,1-0.7,1.5-1.4v-7.6h2.2L13.4,23.3L13.4,23.3z"/>
<path class="st0" d="M17.1,12.3h1.8l0.2,1.8h0.1c0.6-0.6,1.2-1.1,1.8-1.5c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2v-6.5c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4
c-0.5,0.3-1,0.7-1.6,1.3v7.6h-2.2L17.1,12.3L17.1,12.3L17.1,12.3z"/>
<path class="st0" d="M51.9,17.8c0-0.9,0.2-1.7,0.5-2.4c0.3-0.7,0.7-1.3,1.3-1.8c0.5-0.5,1.1-0.9,1.8-1.2c0.7-0.3,1.4-0.4,2.1-0.4
c0.8,0,1.5,0.1,2.2,0.4c0.6,0.3,1.2,0.6,1.6,1.1c0.4,0.5,0.8,1,1,1.6c0.2,0.6,0.3,1.3,0.3,2.1c0,0.2,0,0.4,0,0.6
c0,0.2,0,0.4-0.1,0.5h-8.3c0.1,1.1,0.5,1.9,1.2,2.5c0.7,0.6,1.6,0.9,2.8,0.9c0.6,0,1.2-0.1,1.7-0.2c0.5-0.2,1-0.4,1.5-0.7l0.8,1.4
c-0.6,0.4-1.2,0.7-1.9,0.9c-0.7,0.2-1.5,0.4-2.4,0.4c-0.8,0-1.6-0.1-2.3-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8
C52.1,19.5,51.9,18.7,51.9,17.8z M60.6,16.8c0-1-0.3-1.8-0.8-2.3c-0.5-0.5-1.2-0.8-2.2-0.8c-0.8,0-1.6,0.3-2.2,0.8
c-0.6,0.5-1,1.3-1.2,2.3H60.6z"/>
<path class="st0" d="M70,11.9l0,11.6h-2.2v-8.5h-4.2L70,11.9z M68.7,9.7c-0.5,0-0.9-0.1-1.2-0.4C67.2,9,67,8.6,67,8.1
c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.4,1.2-0.4c0.5,0,0.9,0.1,1.2,0.4c0.3,0.3,0.5,0.7,0.5,1.2c0,0.5-0.2,0.9-0.5,1.2
C69.6,9.5,69.2,9.7,68.7,9.7z"/>
<path class="st0" d="M73.1,18c0-0.9,0.2-1.7,0.5-2.5c0.3-0.7,0.8-1.3,1.4-1.8c0.6-0.5,1.2-0.9,2-1.1c0.7-0.3,1.5-0.4,2.4-0.4
c0.9,0,1.7,0.2,2.4,0.5c0.7,0.3,1.2,0.7,1.7,1.1l-1.1,1.4c-0.4-0.4-0.9-0.6-1.4-0.8c-0.5-0.2-1-0.3-1.5-0.3c-0.6,0-1.1,0.1-1.6,0.3
c-0.5,0.2-0.9,0.5-1.3,0.8c-0.4,0.3-0.6,0.8-0.8,1.3c-0.2,0.5-0.3,1-0.3,1.6c0,0.6,0.1,1.1,0.3,1.6c0.2,0.5,0.5,0.9,0.8,1.3
c0.4,0.3,0.8,0.6,1.3,0.8c0.5,0.2,1,0.3,1.6,0.3c0.7,0,1.3-0.1,1.8-0.4c0.5-0.3,1-0.6,1.5-0.9l0.9,1.4c-0.6,0.5-1.3,1-2.1,1.3
c-0.8,0.3-1.5,0.4-2.3,0.4c-0.9,0-1.7-0.1-2.4-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8C73.2,19.8,73.1,19,73.1,18z"/>
<path class="st0" d="M83.7,7.6l4.7-2.3v6.5l-0.1,2.5c0.6-0.6,1.2-1.1,1.8-1.4c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2V17c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4c-0.5,0.3-1,0.7-1.6,1.3
v7.6h-2.2l0-16L83.7,7.6z"/>
<g>
<polygon class="st0" points="96.4,2.6 95.7,4.2 105,4.2 105.8,2.6 "/>
<polygon class="st0" points="95.7,6.1 94.9,7.7 104.3,7.7 105,6.1 "/>
<polygon class="st0" points="97.5,9.6 101.8,0.4 103.5,0.5 99.2,9.6 "/>
</g>
<g>
<path class="st0" d="M46.3,19.7c0,0.7,0.2,1.3,0.6,1.6c0.4,0.3,0.9,0.5,1.4,0.5c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,1-0.3l0.5,1.6
c-0.2,0.1-0.5,0.2-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.1c-0.3,0-0.5,0.1-0.8,0.1c-1.2,0-2.1-0.3-2.7-1
c-0.6-0.7-0.9-1.7-0.9-3V5.1h-3.5l5.6-4"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -34,9 +34,14 @@
{% set nav_classes = 'navbar-light bg-light' %}
{% endif %}
<nav class="navbar navbar-expand-lg {{ nav_classes }}" style="{{ nav_style }}">
<a class="navbar-brand" href="https://ungleich.ch">ungleich</a>
<a class="navbar-brand" href="https://ungleich.ch">
{% if 'navbar-dark' in nav_classes %}
<img src="/u/image/ungleich-logo-white.svg" width="100px" alt="ungleich" style='padding-top: 0.5rem; padding-bottom: 0.8rem;'>
{% else %}
<img src="/u/image/ungleich-logo-black.svg" width="100px" alt="ungleich" style='padding-top: 0.5rem; padding-bottom: 0.8rem;'>
{% endif %}
</a>
<button class="navbar-toggler" type="button"
data-toggle="collapse"
data-target="#navbarSupportedContent"