change icons, css, add routing to merchandise, add mail templater, fixes

build/css/site.css

@@ -87,10 +87,6 @@ label {
 	background-color: #335012;
 }
 
-a.nav-link {
-	color: #FFF;
-}
-
 .bg-green-ultra-dark {
 	background: linear-gradient(to left top, #102723, #112723, #122724, #122724, #132724);
 	color: #a5b94f;
@@ -213,8 +209,18 @@ div.megamenu ul.megamenu li.megamenu.level1
   cursor: pointer;
 }
 
-.dropdown.megamenu a:hover, .dropdown.megamenu a:active, .dropdown.megamenu div.w-100:hover {
-	background-color: #F2B90F;	
+#navbarContent > ul > li:hover 
+{
+	border-bottom: 4px solid #FFF!important;
+}
+
+.dropdown-menu a > div.w-100:hover
+{
+	background-color: #F2B90F;
+}
+
+a.nav-link {
+	color: #FFF;
 }
 
 .slick-prev:before, .slick-next:before {

build/img/header/basket.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="853.27057"
+   height="677.52399"
+   viewBox="0 0 853.27057 677.52399"
+   version="1.1"
+   id="svg2574"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2578" />
+  <path
+     style="fill:#334f11;stroke:none"
+     d="m 82.007161,331.12709 c -9.8669,20.765 -34.4635,37.4 -34.946,62 -0.2537,12.938 6.5152,25.226 16.946,32.56 4.7935,3.37 16.8458,5.269 17.8519,11.459 1.8008,11.081 0.1481,23.749 0.1481,34.981 0,62.366 -14.0804,141.27 43.999999,183.255 41.754,30.182 99.419,20.745 148,20.745 h 327 c 50.606,0 104.959,7.315 143.996,-32.001 28.527,-28.731 31.004,-63.9 31.004,-101.999 0,-40.148 -3.469,-82.023 0.059,-121.996 0.649,-7.358 11.175,-10.837 15.756,-16.008 7.418,-8.372 9.453,-18.155 9.17,-28.996 -0.506,-19.392 -20.355,-27.341 -24.985,-44 15.625,0 34.951,3.045 50,-1.44 22.507,-6.708 33.446,-33.494 23.676,-54.56 -10.17,-21.928 -30.928,-22 -51.676,-22 h -57 c -8.469,0 -26.045,3.311 -32.83,-2.318 -17.647,-14.639 -31.582,-38.033 -46.251,-55.682 -34.255,-41.214 -68.051,-82.808 -102.333,-123.999998 -11.596,-13.9345 -23.206,-27.8883 -34.586,-42 -7.527,-9.3329 -15.228,-19.8099998 -27,-23.8989298 -33.123,-11.50537 -65.705,26.1725298 -47.525,56.8989298 13.416,22.674 34.415,42.643998 51.101,62.999998 35.039,42.747 70.593,85.083 105.424,128 h -371 c 10.958,-19.236 25.96,-36.998 38.86,-55 23.363,-32.605 46.569,-65.333 69.849,-98 9.805,-13.758898 21.117,-27.269698 29.415,-41.999998 16.568,-29.4106 -10.468,-62.2636698 -42.124,-57.69982976 -15.321,2.20879996 -23.393,14.03052976 -31.709,25.69982976 -9.035,12.6776 -18.083,25.3459 -27.151,38 -29.569,41.265998 -58.968,82.656998 -88.431,123.999998 -14.295,20.059 -27.347,43.932 -44.224,61.852 -6.27,6.658 -24.916,3.148 -33.485,3.148 H 54.007161 c -21.2403,0 -43.6043,1.12 -51.8989199,25 -1.78902002,5.15 -2.21726602,10.588 -2.08642002,16 1.06872002,44.204 51.76713992,37 81.98533992,37 m 166.999999,0.419 c 20.908,-5.173 47.194,-0.205 54.226,22.581 5.792,18.766 1.774,43.474 1.774,63 v 129 c 0,25.916 2.838,59.325 -30,66.331 -22.736,4.851 -44.895,-9.051 -48.561,-32.331 -3.066,-19.47 -0.439,-41.287 -0.439,-61 v -120 c 0,-21.222 -5.281,-60.584 23,-67.581 m 151,0 c 20.908,-5.173 47.194,-0.205 54.226,22.581 5.792,18.766 1.774,43.474 1.774,63 v 129 c 0,25.916 2.838,59.325 -30,66.331 -22.736,4.851 -44.895,-9.051 -48.561,-32.331 -3.066,-19.47 -0.439,-41.287 -0.439,-61 v -120 c 0,-21.222 -5.281,-60.584 23,-67.581 m 164,0 c 20.908,-5.173 47.194,-0.205 54.226,22.581 5.792,18.766 1.774,43.474 1.774,63 v 129 c 0,25.916 2.838,59.325 -30,66.331 -22.736,4.851 -44.895,-9.051 -48.561,-32.331 -3.066,-19.47 -0.439,-41.287 -0.439,-61 v -120 c 0,-21.222 -5.281,-60.584 23,-67.581 z"
+     id="path2580" />
+</svg>

build/img/header/catalogue.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="4122.2734"
+   height="4124.1968"
+   viewBox="0 0 4122.2734 4124.1968"
+   version="1.1"
+   id="svg2503"
+   sodipodi:docname="catalogue.svg"
+   inkscape:export-filename="../../../../../../../../../Desktop/catalogue.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486, 2022-12-01)"
+   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="defs2507" />
+  <sodipodi:namedview
+     id="namedview2505"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.053285166"
+     inkscape:cx="-1895.4619"
+     inkscape:cy="2242.6504"
+     inkscape:window-width="1920"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2503" />
+  <path
+     style="fill:#334f11;stroke:none"
+     d="m 2024.6945,1.5119512 c -19.25,2.52734 -39.59,0.76513 -59,1.61523 -40.36,1.76709 -80.77,5.10547 -121,9.1293498 -116.94,11.6958 -232.81,34.7854 -346,66.2554 C 983.43949,221.77063 536.33549,575.04563 270.54449,1038.0876 c -334.887803,583.42 -360.570603,1315.5 -67.592,1921 69.575,143.79 155.867,280.41 257.166,404 134.464,164.05 292.777,308.58 470.576,424.66 198.93001,129.87 419.76001,225.63 651.00001,280.46 243.58,57.74 498,71.21 746,38.6 247.47,-32.54 489.34,-109.23 709,-228.03 182.38,-98.64 351.13,-224.2 495.99,-372.69 383.94,-393.58 602.48,-935.52 589,-1486 -5.44,-221.89 -45.14,-442.53 -119.68,-652 -217.77,-611.93397 -728.97,-1094.29897 -1350.31,-1280.719969 -142.65,-42.7988 -290.5,-70.1877 -439,-80.3693598 -37.7,-2.58496 -75.24,-3.29736 -113,-4.95019 -24.28,-1.06298997 -50.8,-3.7124 -75,-0.53613 m 2,228.8606788 c 23.67,-2.793 49.29,-0.362 73,0.676 30.4,1.33 60.64,1.87 91,3.95 132.13,9.054 263.99,32.262 391,70.369 172.32,51.702 335.34,127.704 486,226.064 335.52,219.042 593.39,552.52597 724.66,930.65597 62.57,180.26 95.67,370.61 100.33,561 8.26,337.8 -80.89,676.7 -252,968 -284.12,483.68 -799.26,830.77 -1359.99,890.83 -360.71,38.65 -728.57,-18.64 -1053,-186.09 -273.38601,-141.1 -507.39301,-347.44 -681.97401,-600.74 -324.102,-470.23 -411.713,-1101.9 -215.079,-1640 77.511,-212.11 187.45,-408.75 334.325,-580.99997 250.36,-293.612 593.03801,-505.055 968.72801,-594.116 90.64,-21.488 182.4,-34.895 275,-43.714 39.1,-3.724 79.11,-1.295 118,-5.885 m -686,603.139 c -19.33,2.54 -39.52,1.332 -59,2.665 -35.36,2.421 -70.78,5.813 -106,10.196 -121.58,15.128 -241.10801,43.363 -358.00001,79.69 -33.243,10.331 -66.221,21.627 -99,33.333 -36.196,12.926 -69.738,25.627 -94.551,56.69197 -35.738,44.74 -30.449,99.33 -30.449,153 v 288 1178 321 c 0,54.23 -3.554,110.54 42,149.57 66.873,57.3 149.834,18.35 224,-0.2 160.51001,-40.13 324.86001,-66.1 490.00001,-73.33 150.18,-6.58 302.12,6.94 449,39.38 45.12,9.97 89.88,21.9 134,35.61 28.02,8.7 56.2,21.61 85,27.17 18.39,3.54 37.35,2.83 56,2.8 30.57,-0.05 62.58,-14.18 92,-21.63 58.68,-14.86 117.55,-29.1 177,-40.57 171.06,-32.99 343.98,-49.38 518,-41.76 115.68,5.07 234.22,22.32 346,53.38 33.5,9.31 67.01,18.58 100,29.58 35.72,11.91 68.72,25.34 107,18.39 47.84,-8.69 87.13,-47.08 97.58,-94.39 9.09,-41.19 3.42,-87.95 3.42,-130 v -242 -1197 -298 c 0,-54.03 5.91,-109.31 -28.88,-155 -27.08,-35.55297 -66.85,-49.03797 -107.12,-64.04997 -65.98,-24.598 -132.9,-45.928 -201,-63.834 -252.73,-66.454 -515.51,-73.56 -772,-25.505 -78.88,14.778 -157.55,34.306 -234,58.733 -27.09,8.655 -54.08,17.487 -81,26.659 -10.31,3.512 -24.08,11.78 -35,11.779 -5.94,0 -12.53,-4.074 -18,-6.101 -13.97,-5.171 -27.92,-10.451 -42,-15.337 -46.55,-16.158 -93.43,-31.308 -141,-44.193 -124.1,-33.609 -251.61,-55.572 -380,-61.19 -30.34,-1.328 -60.55,-1.961 -91,-1.961 -14.08,0 -29.03,-1.41 -43,0.424 m 599,2036.57597 c -20.45,-2.75 -40.89,-10.35 -61,-15.12 -39.74,-9.42 -79.76,-17.64 -120,-24.63 -124.78,-21.68 -252.42,-31.34 -379,-28.24 -125.51,3.08 -251.22,16.1 -375,38.41 -38.78901,7 -77.50101,14.55 -116.00001,23 -21.505,4.73 -44.069,12.79 -66,14.58 v -1713 c 28.716,-6.64 56.742,-18.77 85,-27.28 58.616,-17.65 118.01001,-32.73 178.00001,-44.92 197.08,-40.05 400.75,-41.44 598,-2 62.76,12.55 123.79,30.04 185,48.48 16.5,4.97 32.67,10.89 49,16.39 5.72,1.92 16.12,3.78 20.4,8.15 4.59,4.69 1.6,21.87 1.6,28.18 v 80 320 1278 m 1346,0 c -20.2,-1.76 -41.22,-10.43 -61,-15.12 -39.73,-9.41 -79.77,-17.64 -120,-24.63 -124.77,-21.68 -252.43,-31.34 -379,-28.24 -125.52,3.08 -251.21,16.1 -375,38.41 -38.79,7 -77.5,14.55 -116,23 -21.48,4.72 -44.11,12.79 -66,14.58 v -1713 c 28.72,-6.64 56.74,-18.77 85,-27.28 56.66,-17.07 114.05,-31.72 172,-43.72 198.94,-41.18 404.74,-43.05 604,-3.2 63.4,12.68 125.31,30 187,49.17 16.43,5.11 32.87,10.43 49,16.45 5.28,1.98 14.38,3.3 18.4,7.4 4.59,4.69 1.6,21.87 1.6,28.18 v 80 321 z"
+     id="path2509" />
+</svg>

build/img/header/login.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="948.25177"
+   height="963.42358"
+   viewBox="0 0 948.25177 963.42358"
+   version="1.1"
+   id="svg2472"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2465">
+    <style
+       id="style2463">
+      .cls-1, .cls-2 {
+        fill: none;
+        stroke: #335012;
+        stroke-width: 23.02px;
+      }
+
+      .cls-2 {
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path
+     style="display:inline;fill:#334f11;stroke:none"
+     d="m 400.70851,955.4236 1,-3 7,2 v 1 h -4 l 9,3 3,-3 4,1 c 0.855,3.992 4.47,3 8,3 8.79,0 17.256,-0.147 26,0 v 1 l -2,2 c 10.406,-5.231 14.011,0.255 24,1 l -2,-4 27,3 1,-3 c 4.053,2.829 21.988,1.935 25,-2 13.111,3.867 25.672,-6.677 38,-9.33 7.51,-1.617 14.515,2.685 22.004,1.987 13.009,-1.211 27.582,-6.655 39.996,-10.686 6.831,-2.219 8.641,-7.382 14.043,-11.318 3.604,-2.626 8.779,-3.645 12.957,-5.113 7.734,-2.717 16.56,-3.316 24,-6.611 12.432,-5.505 23.59,-13.984 35,-21.234 33.417,-21.233 60.864,-44.559 89,-72.695 23.063,-23.063 49.104,-47.323 67.957,-74 10.847,-15.349 17.711,-34.078 25.453,-51 13.432,-29.36 30.478,-59.413 38.834,-91 9.72,-36.743 10.86,-76.469 10.756,-114 l 2,1 -2,-17 c 6.904,-6.04 -2.866,-26.537 1,-35 -3.732,-7.464 -2.254,-19.636 -3.285,-28 -2.83,-22.971 -4.435,-47.101 -12.41,-69 -15.989,-43.903 -34.618,-90.956 -60.66,-130 -8.605,-12.901 -20.143,-23.335 -30.22,-35 -29.218,-33.822 -61.804,-67.519 -97.425,-94.763905 -94.941,-72.616 -222.451,-96.3015 -339,-79.5069096 -22.135,3.18969 -45.59,5.6623096 -67,12.2963096 -75.727,23.4642 -139.839,68.1748 -196,122.959505 -24.629,24.026 -49.286501,50.654 -67.574801,80.015 -26.7349,42.922 -52.0378,94.365 -63.0008,144 -8.2519396,37.361 -9.25326955,77.26 -9.96914955,115 -0.727837,38.37 0.7225,78.122 9.43204995,116 11.0322996,47.979 34.1703996,97.426 58.5401996,140 17.0579,29.801 43.483501,55.911 67.572501,80 37.161,37.161 74.168,71.776 121,96.677 11.056,5.878 24.605,7.288 36,12.725 12.597,6.01 23.718,13.675 37,18.545 23.357,8.563 47.629,3.417 71,12.053 m 56,-913.714505 c 52.501,-6.1947 110.253,6.7624 159,24.1674 8.435,3.0119 17.542,3.2923 26,6.2423 24.489,8.5409 49.358,22.1616 71,36.383805 69.694,45.799 125.493,113.811 159.138,189.921 7.958,18.002 11.94,37.459 18.202,55.985 2.512,7.431 6.794,14.268 9.091,22.015 8.743,29.497 11.569,63.278 11.569,94 0,24.038 0.834,49.252 -3.329,73 -4.136,23.595 -11.951,46.208 -18.757,69 -4.964,16.623 -8.73,33.212 -16.234,49 -9.993,21.024 -23.912,41.273 -36.256,61 -11.634,18.595 -25.877,33.825 -39.309,51 -5.167,6.607 -14.064,17.759 -23.115,18.271 -12.486,0.706 -19.597,-4.806 -21.674,-17.271 -2.497,-14.977 -0.035,-29.996 -4.264,-45 -3.692,-13.096 -11.068,-24.234 -17.548,-36 -9.478,-17.208 -17.67,-34.035 -29.398,-50 -24.655,-33.561 -57.883,-63.283 -94.116,-84.128 -10.667,-6.137 -22.935,-10.473 -33,-17.466 -4.263,-2.963 -9.35,-6.713 -9.681,-12.406 -0.667,-11.442 17.978,-21.389 25.681,-27.35 20.973,-16.227 39.882,-38.375 52.694,-61.65 21.68,-39.383 24.401,-81.786 14.731,-125 -2.089,-9.338 -2.788,-19.169 -6.737,-28 -11.95,-26.72 -31.171,-48.483 -51.688,-69 -19.043,-19.043 -40.661,-38.431 -67,-46.279 -43.936,-13.092 -92.511,-13.204 -135,6.179 -22.521,10.275 -42.833,31.045 -59.17,49.1 -10.559,11.67 -21.49,22.725 -30.135,36 -18.979,29.143 -24.695,61.855 -24.695,96 0,13.992 -0.163,27.469 4.025,41 10.973,35.448 34.058,66.083 59.975,92 9.469,9.469 34.821,22.422 32.772,38 -0.859,6.526 -6.454,10.312 -11.772,13.23 -11.374,6.24 -23.589,10.81 -35,17.082 -35.57,19.548 -65.964,49.471 -90.127,81.688 -20.797,27.73 -42.779,63.776 -50.054,98 -1.967,9.251 -1.243,19.557 -1.909,29 -0.846,12.005 -5.117,24.266 -18.91,22.895 -8.367,-0.832 -16.87,-8.073 -22.536,-13.815 -14.67,-14.866 -26.765,-34.111 -38.891,-51.08 -17.542601,-24.547 -33.847501,-54.649 -44.508201,-83 -3.5315,-9.392 -4.4129,-19.54 -7.7091,-29 -8.5794,-24.622 -16.7531,-51.024 -20.0702,-77 -3.1995,-25.055 -1.2855,-49.911 -1.2855,-75 0,-43.961 9.6749,-82.845 23.7585,-124 4.8743,-14.244 7.1474,-29.119 13.3125,-43 3.5716,-8.042 9.614,-15.142 13.6705,-23 43.101501,-83.497 110.714501,-154.617 197.258501,-194.099505 10.521,-4.7998 22.092,-6.198 33,-9.6459 10.97,-3.4674 20.953,-10.018 32,-12.8765 35.597,-9.2104 70.838,-10.8258 107,-15.0926 m 489,425.714505 -1,1 1,-1 m -450,492 v 1 l -6,-1 h 6 m -38,2 v 1 h 6 v -2 l -6,1 m -8,0 1,1 -1,-1 m 32,0 v 1 h 3 z"
+     id="path2476" />
+</svg>