Merge branch 'cicd_changes' into 'master'

# Conflicts:
#   src/Model/Types/Submission.hs
This commit is contained in:
Steffen Jost 2021-08-30 07:40:34 +00:00
commit 74a7bb6a64
17 changed files with 107 additions and 71 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

BIN
assets/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1,29 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400" viewBox="0, 0, 400,400"><g id="svgg"><path id="path0" d="M254.346 66.700 C 253.826 67.052,251.238 69.424,248.595 71.970 C 206.585 112.450,158.979 125.274,117.043 107.405 C 110.496 104.615,113.696 113.501,122.087 121.411 C 149.172 146.944,209.822 132.540,241.723 93.000 C 251.479 80.908,260.199 62.740,254.346 66.700 M302.142 71.851 C 300.414 73.089,297.920 75.022,296.600 76.147 C 234.301 129.231,276.131 161.718,379.800 140.762 C 399.006 136.880,400.053 135.375,383.200 135.874 C 308.312 138.092,282.352 127.978,290.605 99.800 C 292.524 93.246,299.882 79.875,305.658 72.446 C 308.097 69.310,306.149 68.980,302.142 71.851 M75.200 129.995 C 74.309 130.563,74.979 131.410,78.634 134.332 C 110.940 160.161,92.404 187.096,16.400 224.767 C 7.437 229.209,4.236 231.170,4.885 231.819 C 5.933 232.866,24.690 227.434,41.200 221.300 C 118.251 192.677,141.525 149.641,89.058 132.804 C 82.007 130.541,76.192 129.362,75.200 129.995 M339.000 171.831 C 338.120 171.915,334.610 172.173,331.200 172.405 C 248.491 178.028,206.426 215.983,219.048 273.600 C 221.690 285.662,228.646 302.400,231.017 302.400 C 232.230 302.400,232.126 303.471,232.190 290.400 C 232.385 251.139,244.784 223.208,269.192 207.050 C 289.564 193.565,325.780 182.896,368.400 177.825 C 382.117 176.193,384.237 175.902,385.560 175.468 C 388.861 174.387,386.482 173.616,376.757 172.616 C 370.605 171.984,343.344 171.417,339.000 171.831 M104.400 226.611 C 83.696 229.141,53.638 240.545,26.132 256.307 C 5.050 268.388,2.285 272.099,19.800 264.806 C 58.054 248.876,93.411 241.338,111.906 245.167 C 135.123 249.975,148.608 272.165,150.820 309.200 C 151.366 318.339,151.443 318.800,152.424 318.800 C 154.511 318.800,158.596 305.963,161.014 291.800 C 168.931 245.446,147.951 221.288,104.400 226.611 " stroke="none" fill="#ededf6" fill-rule="evenodd"></path><path id="path1" d="M0.000 200.000 L 0.000 400.000 200.000 400.000 L 400.000 400.000 400.000 200.000 L 400.000 0.000 200.000 0.000 L 0.000 0.000 0.000 200.000 M256.261 67.959 C 255.640 71.949,247.769 85.506,241.723 93.000 C 209.822 132.540,149.172 146.944,122.087 121.411 C 113.696 113.501,110.496 104.615,117.043 107.405 C 158.979 125.274,206.585 112.450,248.595 71.970 C 255.357 65.455,256.766 64.718,256.261 67.959 M306.400 70.546 C 306.400 71.066,306.066 71.921,305.658 72.446 C 299.882 79.875,292.524 93.246,290.605 99.800 C 282.352 127.978,308.312 138.092,383.200 135.874 C 400.053 135.375,399.006 136.880,379.800 140.762 C 342.948 148.212,309.043 149.180,290.200 143.322 C 257.641 133.199,260.115 107.235,296.600 76.147 C 302.891 70.787,306.400 68.781,306.400 70.546 M80.858 130.573 C 104.476 135.931,118.902 148.070,117.414 161.335 C 114.838 184.303,80.846 208.679,26.800 226.315 C 2.305 234.308,-1.660 233.718,16.400 224.767 C 92.404 187.096,110.940 160.161,78.634 134.332 C 74.979 131.410,74.309 130.563,75.200 129.995 C 76.014 129.476,76.025 129.477,80.858 130.573 M376.757 172.616 C 386.482 173.616,388.861 174.387,385.560 175.468 C 384.237 175.902,382.117 176.193,368.400 177.825 C 325.780 182.896,289.564 193.565,269.192 207.050 C 244.784 223.208,232.385 251.139,232.190 290.400 C 232.126 303.471,232.230 302.400,231.017 302.400 C 228.646 302.400,221.690 285.662,219.048 273.600 C 206.426 215.983,248.491 178.028,331.200 172.405 C 334.610 172.173,338.120 171.915,339.000 171.831 C 343.344 171.417,370.605 171.984,376.757 172.616 M126.011 226.637 C 151.558 230.188,164.597 249.285,162.445 280.000 C 161.347 295.672,155.374 318.800,152.424 318.800 C 151.443 318.800,151.366 318.339,150.820 309.200 C 148.608 272.165,135.123 249.975,111.906 245.167 C 93.411 241.338,58.054 248.876,19.800 264.806 C 2.285 272.099,5.050 268.388,26.132 256.307 C 65.109 233.972,101.346 223.208,126.011 226.637 " stroke="none" fill="#040493" fill-rule="evenodd"></path></g></svg>
<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"
id="svg4"
version="1.1"
viewBox="0 0 576 512">
<metadata
id="metadata10">
<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>
<defs
id="defs8" />
<path
style="stroke-width:0.89999998;fill:#0a9342;fill-opacity:1"
id="path2"
d="m 516.7975,54.444679 c -49.32,2.799 -147.348,12.987 -207.864,50.031001 -4.176,2.556 -6.543,7.101 -6.543,11.853 v 327.483 c 0,10.395 11.367,16.965 20.952,12.141 62.262,-31.338 152.307,-39.888 196.83,-42.228 15.201,-0.801 27.018,-12.987 27.018,-27.594 V 82.074679 c 0.009,-15.939 -13.815,-28.566 -30.393,-27.63 z M 267.0565,104.47568 C 206.5495,67.431679 108.5215,57.252679 59.2015,54.444679 c -16.578,-0.936 -30.402,11.691 -30.402,27.63 V 386.13968 c 0,14.616 11.817,26.802 27.018,27.594 44.541,2.34 134.631,10.899 196.893,42.255 9.558,4.815 20.889,-1.746 20.889,-12.114 v -327.708 c 0,-4.761 -2.358,-9.126 -6.543,-11.691 z" />
</svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,18 @@
<?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" width="200pt" height="85.907372pt" viewBox="0 0 200 85.90737" version="1.1" id="svg3336" inkscape:version="0.91 r13725" sodipodi:docname="fraport-geschaeftsbericht-2016_safe.svg">
<metadata id="metadata3639">
<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/>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1600" inkscape:window-height="838" id="namedview3637" showgrid="false" inkscape:zoom="2.6074665" inkscape:cx="40.371528" inkscape:cy="-35.674809" inkscape:window-x="1432" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg3336" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"/>
<defs id="defs3338"/>
<g id="g3732" transform="matrix(1.4699102,0,0,1.4699102,-537.50449,-181.37517)">
<path style="fill:#004a99;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 426.13672,175.76953 3.15234,-16.99609 8.17578,0 -0.38281,2.08593 -5.11719,0 -1,5.36719 5.00391,0 -0.38281,2.08594 -5.00782,0 -1.375,7.45703 z m 9.74219,0 2.25781,-12.14844 2.85937,0 -0.43359,2.31641 0.92969,-1.18359 c 0.36718,-0.46485 0.66406,-0.78907 0.89062,-0.97657 0.37891,-0.30468 0.80469,-0.45703 1.27735,-0.45703 0.6289,0 1.2539,0.3086 1.87109,0.92969 l -1.41016,2.18359 c -0.46875,-0.16797 -0.86718,-0.2539 -1.19531,-0.2539 -0.60156,0 -1.14453,0.22265 -1.62891,0.67578 -0.35546,0.32812 -0.6875,0.89453 -1,1.69922 -0.26562,0.66015 -0.46875,1.36328 -0.60546,2.11328 l -0.95313,5.10156 z m 18.86328,0 -2.8711,0 0.38672,-2.03906 c -0.64453,0.66015 -1.21484,1.14844 -1.71484,1.47265 -0.88281,0.57032 -1.76172,0.85547 -2.64063,0.85547 -1.04687,0 -1.86328,-0.39453 -2.46093,-1.18359 -0.66797,-0.875 -1,-2.03125 -1,-3.47266 0,-1.3125 0.28125,-2.58203 0.84375,-3.8125 0.66015,-1.44531 1.58203,-2.55859 2.76171,-3.32812 0.94922,-0.6211 1.92188,-0.92969 2.92188,-0.92969 0.92969,0 1.69531,0.28906 2.28906,0.86719 0.1875,0.17969 0.39063,0.4414 0.61719,0.78515 l 0.25391,-1.36328 2.87109,0 z m -3.34375,-10.57812 c -0.86719,0 -1.65625,0.42187 -2.375,1.26562 -0.61719,0.72266 -1.05469,1.66406 -1.3125,2.82422 -0.15625,0.69141 -0.23047,1.39062 -0.23047,2.09766 0,0.85156 0.14844,1.51562 0.44531,1.98828 0.30469,0.48437 0.73438,0.72656 1.28125,0.72656 1.16406,0 2.17578,-0.83594 3.02734,-2.51172 0.44922,-0.88281 0.77344,-1.875 0.97657,-2.97656 0.11328,-0.61328 0.16797,-1.11328 0.16797,-1.4961 0,-0.58203 -0.1875,-1.04687 -0.56641,-1.40234 -0.37109,-0.34375 -0.83984,-0.51562 -1.41406,-0.51562 m 5.03515,16.64453 3.37891,-18.21485 2.85937,0 -0.42187,2.30469 c 0.60156,-0.71484 1.14062,-1.25391 1.61719,-1.61719 0.84375,-0.65234 1.76562,-0.97656 2.76172,-0.97656 1.08593,0 1.92187,0.37891 2.50781,1.13281 0.66797,0.86328 1,2.02735 1,3.5 0,1.35938 -0.30469,2.67969 -0.91406,3.95703 -0.69922,1.46094 -1.62891,2.5625 -2.78907,3.29297 -0.89062,0.5625 -1.8125,0.84375 -2.76172,0.84375 -1.14062,0 -2.16406,-0.43359 -3.0625,-1.30468 l -1.3164,7.08203 z m 8.89063,-16.48828 c -1.26172,0 -2.34766,1.02343 -3.25781,3.07421 -0.4336,0.98438 -0.74219,2.03125 -0.92579,3.14844 -0.0664,0.42578 -0.10546,0.67578 -0.12109,0.75 -0.0742,0.33594 -0.10937,0.52735 -0.10937,0.56641 0,0.0469 0.0156,0.0977 0.0469,0.14453 0.0156,0.0234 0.043,0.0547 0.0742,0.0977 0.19922,0.32031 0.50391,0.58984 0.90234,0.80859 0.39063,0.19922 0.79297,0.30078 1.22266,0.30078 1.04297,0 1.96484,-0.63672 2.76172,-1.90625 0.77734,-1.23828 1.16797,-2.65625 1.16797,-4.24609 0,-1.82813 -0.58594,-2.73828 -1.76172,-2.73828 m 12.97656,-2.01563 c 1.10938,0 2.07031,0.3125 2.88281,0.94141 1.35157,1.05468 2.02735,2.5625 2.02735,4.52343 0,1.19922 -0.25782,2.33594 -0.77344,3.41407 -0.60156,1.2539 -1.46484,2.22656 -2.59375,2.91797 -1.00391,0.62109 -2.08984,0.92968 -3.25391,0.92968 -1.44922,0 -2.65234,-0.46484 -3.60937,-1.39843 -1.08594,-1.05469 -1.62891,-2.4336 -1.62891,-4.13672 0,-1.3125 0.33985,-2.55078 1.01563,-3.71485 0.70703,-1.22656 1.64453,-2.13281 2.80859,-2.73047 0.97266,-0.49609 2.01563,-0.74609 3.125,-0.74609 m -0.38672,1.75 c -0.6914,0 -1.33203,0.32031 -1.92969,0.96484 -0.46484,0.51563 -0.84375,1.16797 -1.13281,1.96485 -0.28906,0.82031 -0.43359,1.70703 -0.43359,2.65625 0,1.03515 0.16797,1.88281 0.5039,2.54297 0.37891,0.73437 0.97657,1.09765 1.80079,1.09765 1.23046,0 2.16015,-0.77343 2.79687,-2.32812 0.43359,-1.04297 0.65234,-2.22266 0.65234,-3.53516 0,-2.24219 -0.7539,-3.36328 -2.25781,-3.36328 m 5.80078,10.6875 2.25782,-12.14844 2.85937,0 -0.4375,2.31641 0.93359,-1.18359 c 0.36719,-0.46485 0.66407,-0.78907 0.89063,-0.97657 0.37891,-0.30468 0.80469,-0.45703 1.27734,-0.45703 0.62891,0 1.25,0.3086 1.8711,0.92969 l -1.41016,2.18359 c -0.46875,-0.16797 -0.86719,-0.2539 -1.19531,-0.2539 -0.60156,0 -1.14453,0.22265 -1.62891,0.67578 -0.35156,0.32812 -0.6875,0.89453 -1,1.69922 -0.26562,0.66015 -0.46875,1.36328 -0.60547,2.11328 l -0.95312,5.10156 z m 10.47657,-10.51953 0.30468,-1.62891 1.51953,0 0.54297,-2.94531 2.95313,-0.71094 -0.67188,3.65625 2.89453,0 -0.30468,1.62891 -2.90625,0 -1.09766,5.89844 c -0.17578,0.94922 -0.26562,1.57031 -0.26562,1.85937 0,0.75391 0.36718,1.13281 1.09765,1.13281 0.41797,0 0.96485,-0.10546 1.64063,-0.3125 l 0.16797,1.55469 c -1.07422,0.44922 -2.09766,0.67578 -3.0625,0.67578 -0.86719,0 -1.53907,-0.18359 -2.01563,-0.55468 -0.51562,-0.40235 -0.76953,-0.98438 -0.76953,-1.75 0,-0.32032 0.11719,-1.11719 0.34766,-2.38672 L 495.6875,165.25 Z m 0,0" id="path3463" inkscape:connector-curvature="0"/>
<path style="fill:#004a99;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 414.00391,172.08203 c -0.14063,0.0547 -0.21485,-0.0195 -0.25391,-0.082 -0.0195,-0.0312 -2.05469,-3.28125 -2.70703,-7.52734 -0.38281,-2.48438 -0.21485,-4.8086 0.49219,-6.91016 0.88671,-2.625 2.625,-4.89844 5.17578,-6.76563 2.38672,-1.75 5.45312,-3.10156 9.10937,-4.01953 2.91797,-0.72656 6.21875,-1.18359 9.8125,-1.35156 5.97656,-0.28125 10.81641,0.34766 11.0586,0.37891 0.0586,0.008 0.1875,0.0391 0.17578,0.17187 -0.008,0.0859 -0.0859,0.15235 -0.19141,0.15625 -0.0469,0.004 -4.57812,0.25781 -10.09766,1.26172 -4.98828,0.91016 -11.79687,2.63281 -15.88671,5.6875 -8.31641,6.20313 -6.57422,18.67578 -6.55469,18.80078 0.0117,0.0977 -0.0625,0.17188 -0.13281,0.19922 M 397.5,175.625 c 0.0117,-0.0195 0.95703,-2.30859 1.53516,-5.28516 0.53906,-2.74218 0.85937,-6.625 -0.65235,-9.57812 -1.07812,-2.10156 -2.9414,-3.47656 -5.54297,-4.08203 -2.28515,-0.53516 -5.08203,-0.41407 -8.3164,0.35937 -2.57813,0.61719 -5.44141,1.64844 -8.51563,3.06641 -5.14453,2.375 -9.15625,5.05859 -9.32422,5.17187 -0.0351,0.0234 -0.16015,0.10938 -0.0859,0.24219 0.0469,0.082 0.16406,0.0703 0.21875,0.043 0.15234,-0.0703 15.27343,-7.13672 22.78125,-5.19922 8.14062,2.10547 7.51953,15.08984 7.51562,15.22266 0,0.0664 0.0234,0.1914 0.17578,0.1914 0.082,0 0.16797,-0.0508 0.21094,-0.15234 m -31.82422,-17.61328 c -0.0195,-0.0781 0.0312,-0.15625 0.11719,-0.19141 0.14453,-0.0625 14.32031,-6.13672 17.91406,-11.95312 0.85938,-1.39453 1.10547,-2.77735 0.72656,-4.10938 -0.78906,-2.77344 -4.03125,-4.46484 -4.16797,-4.53515 -0.043,-0.0195 -0.0937,-0.0898 -0.0625,-0.17969 0.0391,-0.10156 0.16407,-0.10938 0.22266,-0.10156 0.18359,0.0312 1.80859,0.28515 3.59375,0.92187 1.74609,0.62109 4.00781,1.74609 4.88672,3.56641 0.64062,1.32812 0.46484,2.84765 -0.51172,4.51562 -1.08594,1.85547 -2.95312,3.65235 -5.53906,5.33203 -2.06641,1.34766 -4.58985,2.625 -7.51172,3.79688 -5.00781,2.01562 -9.41797,3.03125 -9.46094,3.03906 -0.0508,0.008 -0.17578,0.0273 -0.20703,-0.10156 m 38.20313,-21.32813 c 2.65234,-0.72656 5.08984,-1.83984 7.25,-3.30468 1.72656,-1.17188 3.28515,-2.57032 4.6289,-4.16407 2.08985,-2.47656 3.16016,-5.13281 3.33985,-5.59765 0.008,-0.0156 0.0664,-0.1211 -0.0274,-0.20313 -0.0469,-0.0391 -0.1289,-0.0273 -0.19531,0.043 -0.11328,0.1211 -6.61328,7.20313 -15.01563,9.49609 -7.98828,2.1836 -14.48437,-0.94531 -14.80078,-1.10546 -0.043,-0.0195 -0.10547,-0.0352 -0.19531,0.0156 -0.0859,0.0469 -0.082,0.13672 -0.0586,0.19922 0.16406,0.42578 1.01562,2.48437 3.1914,3.76172 1.39063,0.8164 2.97657,1.33594 4.71485,1.54297 0.57422,0.0664 1.16797,0.10156 1.77343,0.10156 1.6875,0 3.49219,-0.26172 5.39454,-0.78516 m 27.86328,2.94532 c -1.26563,0 -2.4375,-0.0625 -3.51172,-0.17969 -3.04688,-0.34375 -5.28125,-1.17969 -6.63672,-2.48438 -0.94141,-0.90625 -1.36328,-1.98437 -1.25781,-3.21484 0.21875,-2.43359 2.51953,-5.04297 4.41015,-6.80859 2.03907,-1.89844 4.0625,-3.25 4.08203,-3.26563 0.0312,-0.0195 0.14454,-0.082 0.23829,-0.0117 0.0781,0.0586 0.0547,0.15625 0.0195,0.19922 -0.0469,0.0508 -4.3711,4.70313 -4.19922,8.35547 0.0469,1.04687 0.46484,1.92578 1.23828,2.60937 2.33594,2.0625 8.08594,2.58204 12.5,2.65625 4.88672,0.082 9.20703,-0.34765 9.25,-0.35156 0.0664,-0.008 0.17969,0.0117 0.19922,0.11328 0.0273,0.15235 -0.1211,0.19141 -0.16406,0.20313 -0.54688,0.13672 -5.41407,1.33203 -10.91797,1.89062 -1.89453,0.19141 -3.64844,0.28907 -5.25,0.28907" id="path3465" inkscape:connector-curvature="0"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 9.3 KiB

37
assets/fraport_logo_notext.svg Executable file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="200px" height="150px" viewBox="0 0 200 150" enable-background="new 0 0 200 150" xml:space="preserve">
<g>
<defs>
<rect id="SVGID_1_" y="0" width="283.46" height="170.08"/>
</defs>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" overflow="visible"/>
</clipPath>
<path clip-path="url(#SVGID_2_)" fill="#000091" d="M138.466,53.129c-2.112,0-4.065-0.1-5.85-0.301
c-5.08-0.57-8.804-1.963-11.067-4.14c-1.568-1.506-2.271-3.308-2.091-5.354c0.365-4.055,4.199-8.409,7.351-11.347
c3.4-3.167,6.765-5.423,6.799-5.444c0.054-0.036,0.245-0.136,0.396-0.024c0.132,0.098,0.095,0.263,0.034,0.332
c-0.075,0.085-7.284,7.839-6.999,13.925c0.081,1.751,0.776,3.216,2.067,4.354c3.893,3.435,13.477,4.301,20.832,4.423
c8.146,0.138,15.348-0.579,15.418-0.585c0.111-0.009,0.297,0.022,0.33,0.191c0.048,0.252-0.202,0.319-0.273,0.337
c-0.907,0.226-9.02,2.219-18.198,3.152C144.062,52.968,141.137,53.129,138.466,53.129 M92.029,48.224
c4.419-1.213,8.484-3.066,12.081-5.508c2.88-1.953,5.476-4.289,7.716-6.945c3.48-4.127,5.267-8.55,5.566-9.326
c0.011-0.028,0.111-0.205-0.043-0.338c-0.08-0.069-0.217-0.046-0.325,0.068c-0.194,0.205-11.026,12.005-25.029,15.831
c-13.314,3.639-24.14-1.581-24.669-1.841c-0.073-0.036-0.172-0.064-0.325,0.022c-0.145,0.081-0.138,0.226-0.095,0.336
c0.272,0.706,1.693,4.139,5.316,6.267c2.319,1.361,4.963,2.225,7.858,2.569c0.959,0.114,1.946,0.171,2.96,0.171
C85.849,49.529,88.86,49.092,92.029,48.224 M28.353,83.766c-0.031-0.124,0.054-0.255,0.2-0.318
c0.238-0.104,23.865-10.225,29.853-19.921c1.435-2.322,1.842-4.626,1.211-6.849c-1.31-4.618-6.714-7.439-6.943-7.556
c-0.073-0.037-0.157-0.149-0.102-0.3c0.062-0.169,0.268-0.182,0.366-0.168c0.307,0.046,3.017,0.476,5.992,1.535
c2.909,1.037,6.682,2.91,8.141,5.941c1.066,2.214,0.78,4.747-0.851,7.531c-1.812,3.091-4.918,6.081-9.23,8.887
c-3.441,2.241-7.653,4.37-12.519,6.326c-8.349,3.36-15.7,5.05-15.77,5.062C28.616,83.952,28.407,83.983,28.353,83.766
M81.398,113.126c0.016-0.036,1.592-3.849,2.56-8.811c0.894-4.568,1.431-11.046-1.093-15.966c-1.796-3.501-4.903-5.791-9.234-6.804
c-3.808-0.891-8.472-0.687-13.863,0.603c-4.295,1.027-9.071,2.746-14.193,5.109c-8.572,3.959-15.258,8.429-15.54,8.618
c-0.057,0.039-0.267,0.183-0.142,0.403c0.077,0.136,0.273,0.119,0.365,0.074c0.251-0.119,25.456-11.894,37.97-8.668
c13.569,3.509,12.532,25.147,12.525,25.371c-0.004,0.116,0.036,0.318,0.291,0.318C81.183,113.375,81.325,113.292,81.398,113.126
M108.903,107.22c-0.232,0.091-0.358-0.031-0.423-0.141c-0.03-0.051-3.423-5.468-4.51-12.542c-0.637-4.14-0.362-8.014,0.819-11.516
c1.476-4.375,4.377-8.17,8.622-11.28c3.983-2.917,9.093-5.169,15.187-6.695c4.862-1.217,10.363-1.976,16.352-2.256
c9.963-0.465,18.031,0.581,18.43,0.63c0.103,0.013,0.314,0.07,0.295,0.291c-0.013,0.14-0.144,0.251-0.32,0.261
c-0.075,0.005-7.626,0.43-16.826,2.103c-8.316,1.512-19.663,4.384-26.48,9.474c-13.858,10.341-10.956,31.13-10.925,31.339
C109.145,107.046,109.02,107.174,108.903,107.22"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@ -1,6 +0,0 @@
<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0" y="0" width="80" height="80" fill="white" stroke="currentColor" stroke-width="2" />
<path d="M6.28906 73.7111V46.4124H8.85405V71.6958H16.7322V73.7111H6.28906Z" fill="currentColor" />
<path d="M19.4804 73.7111V46.4124H28.0914L32.0305 67.8483H32.5801L36.6108 46.4124H45.3135V73.7111H40.0003V50.443H39.5422L34.8703 73.7111H29.5571L24.7936 50.443H24.2439V73.7111H19.4804Z" fill="currentColor" />
<path d="M48.7945 64.0008V46.4124H58.0468V65.0085C58.0468 66.9322 59.6452 67.872 61.3446 67.8483C63.0171 67.8249 64.5508 66.749 64.5508 65.0085V46.4124H73.8031V64.0008C73.8031 66.1078 73.6565 74.2412 61.3446 74.3523C49.0327 74.4635 48.7945 66.0161 48.7945 64.0008Z" fill="currentColor" />
</svg>

Before

Width:  |  Height:  |  Size: 804 B

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 98 KiB

View File

@ -0,0 +1,41 @@
{
"name": "App",
"icons": [
{
"src": "\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}

View File

@ -134,7 +134,7 @@
.asidenav__logo-lmu .asidenav__logo-lmu
width: 80px width: 80px
height: 100% height: 80%
.asidenav__logo-uni2work .asidenav__logo-uni2work
display: flex display: flex

View File

@ -457,7 +457,7 @@ siteLayout' overrideHeading widget = do
asidenav :: WidgetFor UniWorX () asidenav :: WidgetFor UniWorX ()
asidenav = $(widgetFile "widgets/asidenav/asidenav") asidenav = $(widgetFile "widgets/asidenav/asidenav")
where where
logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/lmu/logo.svg") logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/fraport_logo_notext.svg")
footer :: WidgetFor UniWorX () footer :: WidgetFor UniWorX ()
footer = $(widgetFile "widgets/footer/footer") footer = $(widgetFile "widgets/footer/footer")
where isNavFooter = has $ _1 . _NavFooter where isNavFooter = has $ _1 . _NavFooter

View File

@ -149,7 +149,7 @@ data AuthorshipStatementSubmissionState
deriving (Eq, Read, Show, Enum, Bounded, Generic, Typeable) deriving (Eq, Read, Show, Enum, Bounded, Generic, Typeable)
deriving anyclass (Universe, Finite) deriving anyclass (Universe, Finite)
deriving stock instance Ord AuthorshipStatementSubmissionState deriving stock instance Ord AuthorshipStatementSubmissionState -- Larger roughly encodes better; summaries are taken with max
nullaryPathPiece ''AuthorshipStatementSubmissionState $ camelToPathPiece' 1 nullaryPathPiece ''AuthorshipStatementSubmissionState $ camelToPathPiece' 1
pathPieceCsv ''AuthorshipStatementSubmissionState pathPieceCsv ''AuthorshipStatementSubmissionState

View File

@ -3,8 +3,7 @@
-- prevents rebuilds if files change, that are not directly used (like -- prevents rebuilds if files change, that are not directly used (like
-- webpack bundles) -- webpack bundles)
module Settings.StaticFiles module Settings.StaticFiles
( img_lmu_sigillum_svg ( webpackLinks_main
, webpackLinks_main
, embeddedStatic , embeddedStatic
, module Yesod.EmbeddedStatic , module Yesod.EmbeddedStatic
) where ) where

View File

@ -4,9 +4,7 @@ $newline never
<a href="/" .asidenav__logo-link> <a href="/" .asidenav__logo-link>
<div .asidenav__logo-lmu > <div .asidenav__logo-lmu >
#{logo} #{logo}
<span .asidenav__logo-uni2work>
_{MsgLogo}
<div .asidenav> <div .asidenav>
$if null favouriteTerms && is _Just muid $if null favouriteTerms && is _Just muid
@ -49,6 +47,4 @@ $newline never
$if anyFavToggle $if anyFavToggle
<div .asidenav__box-explanation> <div .asidenav__box-explanation>
_{MsgFavouritesToggleTip} _{MsgFavouritesToggleTip}
<div .asidenav__sigillum>
<img src=@{StaticR img_lmu_sigillum_svg}>

View File

@ -145,12 +145,7 @@ async function webpackConfig() {
path.resolve(__dirname, 'well-known'), path.resolve(__dirname, 'well-known'),
] ]
}), }),
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
new CopyPlugin({
patterns: [
{ from: 'assets/lmu/sigillum.svg', to: path.resolve(__dirname, 'static', 'img/lmu/sigillum.svg') },
]
}),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
VERSION: JSON.stringify(packageVersion) VERSION: JSON.stringify(packageVersion)
}), }),