Commits: 9
Add bettertechclub.eu domain
index 98234b2..f3861cb 100644
--- a/.domains
+++ b/.domains
@@ -1 +1,2 @@
=fossfor.eu
+bettertechclub.euChange the home page title
Mostly to test new Codeberg pages deployment method.
index aa12a08..1ac19d1 100644
--- a/index.html
+++ b/index.html
@@ -3,14 +3,14 @@
= <head>
= <meta charset="utf-8">
= <meta http-equiv="x-ua-compatible" content="ie=edge">
- <title>FOSS for Normies</title>
+ <title>Better Tech Club</title>
= <meta name="description" content="A network of local groups for the promotion and mutual support of free and open source software use.">
= <meta name="viewport" content="width=device-width, initial-scale=1">
= <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
= <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
= <link rel="shortcut icon" href="/favicon.ico" />
= <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
- <meta name="apple-mobile-web-app-title" content="fossfor.eu" />
+ <meta name="apple-mobile-web-app-title" content="Better Tech Club" />
= <link rel="manifest" href="/site.webmanifest" />
= <style type="text/css" media="screen">
= html, body {Make bettertechclub.eu the primary domain
According to https://docs.codeberg.org/codeberg-pages/using-custom-domain/ requests targetting other domains (like fossfor.eu) will be redirected.
index f3861cb..4ac3bce 100644
--- a/.domains
+++ b/.domains
@@ -1,2 +1,2 @@
-fossfor.eu
=bettertechclub.eu
+fossfor.euRebrand: icons, manifest, etc.
index f13c531..b385d8b 100644
Binary files a/apple-touch-icon.png and b/apple-touch-icon.png differindex b6b0dde..002b2c3 100644
Binary files a/favicon-96x96.png and b/favicon-96x96.png differindex 3b5b429..6ab1831 100644
Binary files a/favicon.ico and b/favicon.ico differindex abfe745..8c15d72 100644
--- a/favicon.svg
+++ b/favicon.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><svg width="32" height="32" viewBox="0 0 32 32" version="1.1" id="SvgjsSvg1013" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><defs id="SvgjsDefs1012"></defs><metadata id="SvgjsMetadata1011"><rdf:rdf><cc:work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"></dc:type></cc:work></rdf:rdf></metadata><g id="SvgjsG1010" transform="translate(-692)"><g id="SvgjsG1009"><rect style="opacity:1;fill:#003399;fill-opacity:1;fill-rule:evenodd;stroke-width:0.1;stroke-dasharray:none;paint-order:stroke fill markers" id="SvgjsRect1008" width="32" height="32" x="692" y="0"></rect><path id="SvgjsPath1007" style="opacity:1;fill:#fdcb0b;fill-opacity:1;fill-rule:evenodd;stroke-width:0.1;stroke-dasharray:none;paint-order:stroke fill markers" d="m 699,11 v 2 h -4 v 2 h 3 v 2 h -3 v 4 h 6 v -1 h -1 v -8 h 1 v -1 z m 7,0 v 1 h 1 v 8 h -1 v 1 h 3 v -1 h -1 v -2 h 2 v 1 h 3 v -2 h -4 v -1 h -1 v -4 h 1 v -1 z m 8,0 v 1 h 1 v 2 h -2 v -1 h -3 v 2 h 4 v 1 h 1 v 4 h -1 v 1 h 3 v -1 h -1 v -2 h 2 v 1 h 3 v -2 h -4 v -1 h -1 v -4 h 1 v -1 z m 8,0 v 1 h 1 v -1 z m -19,2 v 1 h -1 v 4 h 1 v 1 h 1 v -1 h 1 v -4 h -1 v -1 z m 15,0 v 2 h 4 v 1 h 1 v -2 h -2 v -1 z m 4,7 v 1 h 1 v -1 z"></path></g></g></svg><style>@media (prefers-color-scheme: light) { :root { filter: none; } }
-@media (prefers-color-scheme: dark) { :root { filter: none; } }
-</style></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" viewBox="0 0 32 32" id="svg8" xml:space="preserve" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rdf:Description><dc:creator>RealFaviconGenerator</dc:creator><dc:source>https://realfavicongenerator.net</dc:source></rdf:Description></rdf:RDF></metadata><defs id="defs2"></defs><metadata id="metadata5"><rdf:rdf><cc:work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"></dc:type></cc:work></rdf:rdf></metadata><g id="layer1" transform="translate(-1010)"><g id="g6-8" transform="matrix(0.25803766,0,0,0.25803766,748.86854,-0.51542493)"><path fill="#fac036" d="m 1108.66,32.68 c -4.62,-8.6 -7.22,-13.43 -12.79,-20.46 -5.56,-7.03 -12.14,-14.07 -19.5,-7.78 -3.72,3.17 -2.6,8.21 0.17,13.22 -0.47,-0.31 0.43,2.16 -0.01,1.83 -8.35,-6.37 -10.13,-5.67 -13.01,-3.39 -6.84,5.41 4.96,16.47 8.81,22.4 0.66,1.02 3.07,1.97 3.64,2.91 0.39,0.64 0.76,1.26 1.11,1.86 -0.43,-0.13 -0.87,-0.26 -1.32,-0.39 -4.04,-1.13 -13.32,-2.35 -17.54,-0.76 -26.18,9.88 -24.86,14.19 -22.85,19.85 2.01,5.66 9.35,9.84 21.35,2.38 14.81,-6.12 27.11,2.08 27.11,10.6 0,11.7 -3.83,18.31 -13.88,18.31 -15.89,0 -16.74,-12.96 -25.23,-21.45 -2.29,-2.29 -7.79,-2.96 -11.04,-0.61 -7.58,5.49 -2.68,16.88 -0.79,20.69 3.96,7.97 8.84,19.53 21.69,29.95 6.76,5.48 23.53,4.64 33.23,2.66 18.44,-3.76 22.15,-16.01 28.07,-36.98 2.23,-7.89 2.53,-14.24 2.53,-23.05 0,-8.81 -5.45,-23.78 -9.75,-31.79 z" id="path1-0"></path><path fill="#e48c15" d="m 1108.3,60.49 c -1.18,-5.04 -10.83,-12.92 -14.85,-15.52 -0.41,-2.2 -6.34,-15.14 -10.18,-20.25 -2.13,-2.84 -6.07,-6.68 -7.46,-8.44 0,0 0.34,1.39 -0.65,2.19 0.38,0.46 6.15,7.73 8.55,13.13 2.4,5.4 4.39,11.24 4.39,11.24 -2.61,-0.87 -12.93,-4.33 -15.78,-4.34 0,0 1,0.9 0.98,2.56 -0.02,1.55 -2.17,0.73 -0.98,1.08 7.62,2.21 18.26,4.85 24.82,11.13 2.59,2.49 6.42,7.22 8.22,10.33 1.3,2.22 3.26,-1.74 2.94,-3.11 z" id="path2-8"></path></g></g></svg>
\ No newline at end of filesimilarity index 100%
rename from icon.svg
rename to foss-for-normies-icon.svgindex 1ac19d1..7f6aa29 100644
--- a/index.html
+++ b/index.html
@@ -18,8 +18,14 @@
= min-height: 100%;
= color: #fdcb0b;
= font-family: sans-serif;
+ margin: 0;
+ padding: 0;
+ }
+
+ body {
= display: flex;
- justify-content: center;
+ flex-direction: column;
+ align-items: center;
= }
=
= #big-logo {
@@ -48,6 +54,15 @@
=
= }
=
+ footer {
+ background: oklch(20% 0% 0deg);
+ color: oklch(80% 0% 0deg);
+ width: 100%;
+ padding: 2rem;
+ font-size: 0.8rem;
+ text-align: center;
+ }
+
= .local-group {
= background: hsl(0,0%,70%);
= color: hsl(0,0%,20%);
@@ -151,5 +166,18 @@
=
= <p>⏳ More details to come. Please be patient...</p>
= </main>
+
+ <footer>
+ <p>
+ <strong>Better Tech Club</strong>
+ formerly known as
+ <img
+ src="foss-for-normies-icon.svg"
+ alt="FOSS for Normies icon"
+ style="vertical-align: -12px"
+ />
+ FOSS for Normies.
+ </p>
+ </footer>
= </body>
=</html>index 0d80090..dfe78a3 100644
--- a/logo.svg
+++ b/logo.svg
@@ -1,12 +1,11 @@
=<?xml version="1.0" encoding="UTF-8" standalone="no"?>
=<svg
- width="640"
- height="640"
- viewBox="0 0 640 640"
+ width="1000"
+ height="1000"
+ viewBox="0 0 1000 1000"
= version="1.1"
= id="svg8"
= xml:space="preserve"
- xmlns:xlink="http://www.w3.org/1999/xlink"
= xmlns="http://www.w3.org/2000/svg"
= xmlns:svg="http://www.w3.org/2000/svg"
= xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -16,76 +15,30 @@
= id="metadata5"><rdf:RDF><cc:Work
= rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
= rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
- id="layer1"
- transform="translate(-734)"><g
- id="g3"
- transform="translate(1383,-3)"
- style="stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"><g
- id="g13"
- style="stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"><path
- style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
- d="M 4,16 V 8 C 4,4 8,4 8,4 h 2"
- id="path2-4" /><path
- style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
- d="M 2,10 H 7"
- id="path3" /></g><path
- style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
- d="m 13,8 c 0,0 4,0 4,4 0,0 0,4 -4,4 0,0 -4,0 -4,-4 0,0 0,-4 4,-4 z"
- id="path1" /><g
- id="g5"
- transform="translate(-4,4)"
- style="stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"><path
- style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
- d="m 24,4 v 8"
- id="path4" /><path
- style="fill:none;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
- d="m 24,8 c 0,0 0,-4 4,-4"
- id="path5" /></g><path
- id="path21"
- style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
- d="M 31,16 V 9 C 31,8 31,8 30,8 m 7,8 v -5 c 0,-3.103007 -3,-3 -3,-3 0,0 -3,0 -3,3" /><use
- x="0"
- y="0"
- xlink:href="#path1"
- id="use12"
- transform="translate(31)"
- style="stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none" /><use
- x="0"
- y="0"
- xlink:href="#g5"
- id="use13"
- transform="translate(31)"
- style="stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none" /><path
- id="path10"
- style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
- d="M 59,10 C 59,8 59,8 58,8 M 62.999999,16 63,10.033814 c 0,0 0,-2.0338128 -2.000001,-2.0338119 0,0 -1.999998,-4e-7 -1.999999,1.9999974 L 58.999999,16 m 8,0 L 67,10.033814 c 0,0 0,-2.0338128 -2.000001,-2.0338119 0,0 -1.999999,-4e-7 -1.999999,1.9999974" /><g
- id="g21"><path
- id="path16"
- style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
- d="m 70,10 h 2 v 4 c 0,1 1,2 2,2" /><path
- style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;paint-order:stroke fill markers"
- id="path17"
- d="m 72.5,7 a 0.5,0.5 0 0 1 -0.499609,0.4999998 0.5,0.5 0 0 1 -0.50039,-0.4992173 0.5,0.5 0 0 1 0.498825,-0.5007811 0.5,0.5 0 0 1 0.501172,0.4984337 L 72,7 Z" /></g><path
- id="path19"
- style="opacity:1;vector-effect:none;fill:none;fill-rule:evenodd;paint-order:stroke fill markers"
- d="m 76,12 v 0 0 0 h 8 c 0,-2.209139 -1.790861,-4 -4,-4 -2.209139,0 -4,1.790861 -4,4 0,2.209139 1.790861,4 4,4 h 3" /><path
- id="path10-5"
- style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
- d="M 82,15.999994 88.96619,16 c 0,0 2.03384,-1.3e-5 2.03382,-2.000011 0,0 0,-1.999988 -2.00001,-2 m -0.0338,6e-6 c 0,0 -1.9662,3.1e-5 -1.9662,-1.999989 0,0 -2e-5,-2.000021 1.99999,-2.000014 H 90" /></g><g
- id="g2"
- style="color:#fdcb0b"><rect
- style="opacity:1;fill:#003399;fill-opacity:1;fill-rule:evenodd;stroke-width:0.1;stroke-dasharray:none;paint-order:stroke fill markers"
- id="rect3"
- width="640"
- height="640"
- x="734"
- y="0" /><path
- id="rect3-0"
- style="fill:currentColor;fill-opacity:1;fill-rule:evenodd;stroke-width:0;stroke-dasharray:none;paint-order:stroke fill markers"
- d="m 832,224 0,32 a 4,4 135 0 1 -4,4 h -72 a 4,4 135 0 0 -4,4 l 0,32 a 4,4 45 0 0 4,4 h 52 a 4,4 45 0 1 4,4 l 0,32 a 4,4 135 0 1 -4,4 h -52 a 4,4 135 0 0 -4,4 v 72 a 4,4 45 0 0 4,4 h 112 a 4,4 135 0 0 4,-4 v -12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 45 0 1 -4,-4 l 0,-152 a 4,4 135 0 1 4,-4 h 12 a 4,4 135 0 0 4,-4 v -12 a 4,4 45 0 0 -4,-4 h -32 a 4,4 135 0 0 -4,4 z m 140,0 v 12 a 4,4 45 0 0 4,4 h 12 a 4,4 45 0 1 4,4 l 0,152 a 4,4 135 0 1 -4,4 h -12 a 4,4 135 0 0 -4,4 v 12 a 4,4 45 0 0 4,4 h 52 a 4,4 135 0 0 4,-4 v -12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 45 0 1 -4,-4 l 0,-32 a 4,4 135 0 1 4,-4 h 32 a 4,4 45 0 1 4,4 v 12 a 4,4 45 0 0 4,4 h 52 a 4,4 135 0 0 4,-4 v -32 a 4,4 45 0 0 -4,-4 h -72 a 4,4 45 0 1 -4,-4 v -12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 45 0 1 -4,-4 v -72 a 4,4 135 0 1 4,-4 h 12 a 4,4 135 0 0 4,-4 v -12 a 4,4 45 0 0 -4,-4 h -52 a 4,4 135 0 0 -4,4 z m 160,0 v 12 a 4,4 45 0 0 4,4 h 12 a 4,4 45 0 1 4,4 v 32 a 4,4 135 0 1 -4,4 h -32 a 4,4 45 0 1 -4,-4 v -12 a 4,4 45 0 0 -4,-4 h -52 a 4,4 135 0 0 -4,4 v 32 a 4,4 45 0 0 4,4 h 72 a 4,4 45 0 1 4,4 v 12 a 4,4 45 0 0 4,4 h 12 a 4,4 45 0 1 4,4 l 0,72 a 4,4 135 0 1 -4,4 h -12 a 4,4 135 0 0 -4,4 v 12 a 4,4 45 0 0 4,4 h 52 a 4,4 135 0 0 4,-4 v -12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 45 0 1 -4,-4 v -32 a 4,4 135 0 1 4,-4 h 32 a 4,4 45 0 1 4,4 v 12 a 4,4 45 0 0 4,4 h 52 a 4,4 135 0 0 4,-4 v -32 a 4,4 45 0 0 -4,-4 h -72 a 4,4 45 0 1 -4,-4 v -12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 45 0 1 -4,-4 l 0,-72 a 4,4 135 0 1 4,-4 h 12 a 4,4 135 0 0 4,-4 v -12 a 4,4 45 0 0 -4,-4 h -52 a 4,4 135 0 0 -4,4 z m 160,0 0,12 a 4,4 45 0 0 4,4 h 12 a 4,4 135 0 0 4,-4 l 0,-12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 135 0 0 -4,4 z m -380,40 v 12 a 4,4 135 0 1 -4,4 h -12 a 4,4 135 0 0 -4,4 v 72 a 4,4 45 0 0 4,4 h 12 a 4,4 45 0 1 4,4 v 12 a 4,4 45 0 0 4,4 h 12 a 4,4 135 0 0 4,-4 v -12 a 4,4 135 0 1 4,-4 h 12 a 4,4 135 0 0 4,-4 v -72 a 4,4 45 0 0 -4,-4 h -12 a 4,4 45 0 1 -4,-4 v -12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 135 0 0 -4,4 z m 300,0 v 32 a 4,4 45 0 0 4,4 h 72 a 4,4 45 0 1 4,4 l 0,12 a 4,4 45 0 0 4,4 h 12 a 4,4 135 0 0 4,-4 v -32 a 4,4 45 0 0 -4,-4 h -32 a 4,4 45 0 1 -4,-4 v -12 a 4,4 45 0 0 -4,-4 h -52 a 4,4 135 0 0 -4,4 z m 80,140 0,12 a 4,4 45 0 0 4,4 h 12 a 4,4 135 0 0 4,-4 l 0,-12 a 4,4 45 0 0 -4,-4 h -12 a 4,4 135 0 0 -4,4 z"
- transform="translate(42)" /><use
- x="0"
- y="0"
- xlink:href="#g3"
- id="use23"
- transform="matrix(4,0,0,4,-4750,436)" /></g></g></svg>
+ id="layer1"><g
+ id="text1"
+ style="font-size:143.267px;line-height:1.25;font-family:'EB Garamond';-inkscape-font-specification:'EB Garamond, @wght=700';font-variation-settings:'wght' 700;stroke:#ffffff;stroke-width:10;paint-order:markers stroke fill"
+ aria-label="Big Tech Club"><path
+ d="m 552.0059,380.71633 q -1.28941,0 -2.14901,-0.71633 -0.71633,-0.57307 -0.71633,-1.43267 0,-2.149 3.15187,-3.00861 4.87108,-1.2894 6.87682,-3.0086 2.149,-1.71921 2.149,-6.30375 v -65.18649 q 0,-4.58454 -1.86247,-6.59028 -1.86247,-2.149 -6.87682,-3.15187 -1.86247,-0.4298 -2.5788,-1.14614 -0.71634,-0.8596 -0.71634,-1.86247 0,-0.8596 0.85961,-1.43267 0.8596,-0.71633 2.149,-0.71633 4.58454,0 7.59315,0.28653 3.00861,0.28653 5.58741,0.57307 2.72208,0.14327 6.30375,0.14327 3.29514,0 6.01722,-0.28654 2.72207,-0.4298 6.01721,-0.71633 3.43841,-0.28654 8.30949,-0.28654 17.04877,0 25.78806,4.87108 8.88255,4.72781 8.88255,16.4757 0,4.44128 -2.00574,8.45276 -2.00574,3.86821 -5.15761,6.44701 -2.29227,2.00574 -4.87108,3.29514 -2.43554,1.28941 -5.58741,2.14901 -0.57307,0.14327 -0.57307,0.71633 0,0.57307 0.57307,0.71634 3.72494,0.8596 7.73642,2.29227 4.01147,1.2894 7.44988,3.86821 3.58168,2.57881 5.58741,6.73355 2.14901,4.01147 2.14901,10.31522 0,8.02295 -2.57881,12.75077 -2.43554,4.58454 -6.01721,7.02008 -3.43841,2.43554 -6.44702,4.01147 -4.72781,2.29228 -10.74502,3.43841 -6.01722,1.14614 -14.3267,1.14614 -4.72781,0 -9.59889,-0.28654 Q 577.65069,380 572.34981,380 q -3.00861,0 -6.59028,0.14327 -3.58168,0.14326 -7.16335,0.28653 -3.43841,0.28653 -6.59028,0.28653 z m 40.11476,-8.02295 q 4.29801,0 8.02295,-2.5788 3.86821,-2.57881 6.01721,-6.87682 2.29227,-4.44128 2.29227,-10.02869 0,-4.87108 -1.2894,-8.16622 -1.14614,-3.29514 -2.86534,-5.30088 -1.57594,-2.00573 -3.00861,-3.0086 -1.14613,-1.00287 -4.15474,-2.00574 -2.86534,-1.14614 -7.16335,-1.14614 -2.43554,0 -4.58454,1.28941 -2.00574,1.14613 -2.00574,3.4384 v 25.215 q 0,4.72781 2.29227,7.02008 2.29227,2.149 6.44702,2.149 z m -3.00861,-45.5589 q 3.43841,0 6.30375,-0.71634 2.86534,-0.8596 5.87394,-3.15187 1.00287,-1.00287 2.72208,-4.01148 1.86247,-3.15187 1.86247,-9.02582 0,-6.01721 -1.57594,-10.02869 -1.57594,-4.01147 -4.87108,-6.01721 -3.15187,-2.00574 -8.45275,-2.00574 -4.01148,0 -5.87395,1.57594 -1.7192,1.43267 -1.7192,4.44127 v 23.92559 q 0,2.86534 2.00574,4.01148 2.00573,1.00287 3.72494,1.00287 z m 52.5789,53.29532 q -0.8596,0 -1.57593,-0.4298 -0.71634,-0.57307 -0.71634,-1.43267 0,-1.14614 0.71634,-1.86247 0.71633,-0.71634 1.86247,-1.00287 3.72494,-0.8596 5.15761,-1.86247 1.57594,-1.14614 1.57594,-3.43841 v -30.94567 q 0,-4.87108 -1.57594,-6.87682 -1.43267,-2.149 -4.58454,-2.5788 -0.85961,-0.14327 -1.28941,-0.8596 -0.4298,-0.71634 -0.4298,-1.71921 0,-2.149 1.57594,-2.43554 7.44988,-1.43267 13.18056,-4.01147 5.87395,-2.57881 9.02582,-4.01148 2.29228,-1.14614 2.86534,-1.14614 1.86248,0 1.86248,1.71921 -0.14327,2.43554 -0.71634,6.16048 -0.4298,3.58167 -0.8596,7.44988 -0.28654,3.86821 -0.28654,7.44989 v 31.662 q 0,2.00574 1.43267,3.15188 1.57594,1.14613 5.44415,2.29227 1.14614,0.4298 1.86247,1.00287 0.71634,0.57307 0.71634,1.7192 0,1.86247 -2.14901,1.86247 -2.72207,0 -5.73068,-0.14326 -3.00861,-0.14327 -5.87395,-0.28654 -2.72207,-0.14326 -5.30087,-0.14326 -2.43554,0 -5.15762,0.14326 -2.5788,0.14327 -5.44414,0.28654 -2.72208,0.28653 -5.58742,0.28653 z m 15.75937,-71.06043 q -4.44127,0 -7.87968,-3.29514 -3.29514,-3.29514 -3.29514,-7.87969 0,-4.87107 3.29514,-8.16621 3.43841,-3.29515 7.87968,-3.29515 5.01435,0 8.30949,3.29515 3.29514,3.29514 3.29514,8.16621 0,4.58455 -3.29514,7.87969 -3.29514,3.29514 -8.30949,3.29514 z m 52.14921,112.03479 q -14.04017,0 -21.91985,-4.44127 -7.73642,-4.29801 -7.73642,-11.89117 0,-4.29801 1.00287,-7.02008 1.00287,-2.5788 4.58454,-5.15761 2.72207,-2.00574 5.30088,-4.01148 2.57881,-2.00573 4.44128,-3.29514 l 7.02008,2.43554 q -4.44128,2.57881 -7.02008,5.58741 -2.43554,3.00861 -2.43554,7.02009 0,5.87394 4.87108,9.74215 5.01434,3.86821 12.46422,3.86821 9.88543,0 14.04017,-3.86821 2.57881,-2.5788 4.15474,-5.87394 1.57594,-3.15188 1.57594,-6.44702 0,-2.29227 -1.57594,-3.72494 -1.57593,-1.43267 -5.73068,-2.43554 -4.01147,-1.00287 -11.31809,-1.7192 -14.89977,-1.43267 -21.20352,-5.58742 -6.30374,-4.15474 -6.30374,-11.03155 0,-1.28941 0.71633,-2.57881 0.8596,-1.43267 3.15188,-3.00861 2.29227,-1.7192 4.15474,-3.0086 1.86247,-1.43267 3.15187,-2.57881 1.28941,-1.2894 1.71921,-2.29227 l 7.16335,2.43554 q -2.86534,1.00287 -4.72781,2.72207 -1.71921,1.7192 -1.71921,3.00861 0,1.57593 1.86247,2.5788 1.86247,1.00287 6.30375,1.71921 4.44128,0.57306 12.17769,1.14613 15.47284,1.28941 22.49292,4.87108 7.02009,3.43841 7.02009,10.17196 0,5.87394 -3.29514,11.60462 -3.29515,5.87395 -8.73929,10.60176 -5.44415,4.87108 -12.1777,7.59315 -6.59028,2.86534 -13.46709,2.86534 z m 1.86247,-61.46154 q 4.58454,0 7.16335,-5.01434 2.72207,-5.15762 2.72207,-13.4671 0,-5.30088 -1.43267,-9.16909 -1.2894,-4.01148 -3.58168,-6.16048 -2.29227,-2.29227 -5.44414,-2.29227 -2.72207,0 -5.01435,2.29227 -2.29227,2.29227 -3.72494,6.16048 -1.2894,3.72494 -1.2894,8.73929 0,5.30088 1.43267,9.59889 1.43267,4.29801 3.86821,6.87681 2.43554,2.43554 5.30088,2.43554 z m -1.57594,6.30375 q -6.30375,0 -12.46423,-3.00861 -6.01721,-3.15187 -10.02869,-8.59602 -3.86821,-5.44414 -3.86821,-12.17769 0,-7.16335 4.01148,-12.75077 4.15474,-5.58741 10.74502,-8.59602 6.73355,-3.15187 14.18344,-3.15187 4.44127,0 8.30948,1.00287 4.01148,1.00287 8.73929,1.7192 2.72207,0.57307 5.44414,0.8596 2.72208,0.28654 6.01722,0.28654 2.149,0 4.29801,-0.14327 2.149,-0.28653 3.58167,-0.28653 2.29228,0 2.29228,3.15187 0,2.72207 -1.86248,5.15761 -0.8596,1.00287 -1.86247,1.00287 h -3.86821 q -3.72494,0 -5.01434,1.14614 -0.28653,0.28653 -0.4298,0.71633 -0.14327,0.28654 -0.28654,1.57594 0,1.14614 0,4.44128 0,7.44988 -3.8682,13.75363 -3.86821,6.30375 -10.17196,10.17196 -6.30375,3.72494 -13.8969,3.72494 z"
+ id="path7" /><path
+ d="m 576.21802,559.51355 q -1.00287,0 -2.14901,-0.4298 -1.14613,-0.57307 -1.14613,-1.57594 0,-1.2894 1.00287,-2.00574 1.00287,-0.71633 2.43554,-1.00287 5.44414,-1.14613 7.87968,-3.0086 2.57881,-1.86247 2.57881,-6.44702 v -59.16927 q 0,-5.58741 -0.28654,-8.16622 -0.28653,-2.72207 -0.8596,-3.58167 -0.4298,-1.00287 -1.14614,-1.28941 -1.2894,-0.71633 -3.4384,-0.71633 -2.00574,-0.14327 -3.29514,-0.14327 h -3.15188 q -4.58454,0 -8.73929,2.29227 -4.01147,2.14901 -6.44701,5.44415 -0.71634,1.00287 -2.14901,2.86534 -1.2894,1.7192 -2.86534,3.15187 -1.43266,1.28941 -2.86533,1.28941 -1.14614,0 -1.57594,-0.71634 -0.4298,-0.8596 -0.4298,-1.86247 0,-1.7192 0.8596,-3.58167 2.72207,-5.44415 4.01147,-9.31236 1.28941,-3.86821 1.71921,-8.88255 0.28653,-2.14901 1.2894,-2.86534 1.00287,-0.8596 2.29227,-0.8596 1.00287,0 2.14901,1.86247 1.14613,1.86247 2.43554,3.0086 1.43267,1.14614 4.72781,1.71921 3.43841,0.57307 5.58741,0.57307 h 53.86839 q 3.58168,0 6.01722,-0.71634 2.5788,-0.71633 3.86821,-1.43267 2.29227,-1.2894 3.58167,-2.86534 1.43267,-1.57594 3.29514,-1.57594 0.8596,0 1.14614,0.71634 0.4298,0.57307 0.4298,1.7192 0,0.57307 -0.14327,1.43267 0,0.8596 -0.14327,1.57594 -0.71633,2.72207 -1.43267,5.30088 -0.71633,2.43554 -1.14613,4.72781 -0.4298,2.29227 -0.4298,4.72781 v 2.86534 q 0,2.29227 -0.57307,3.72494 -0.4298,1.43267 -1.86247,1.43267 -1.2894,0 -2.14901,-1.2894 -0.8596,-1.43267 -1.86247,-4.44128 -1.57593,-5.15761 -4.72781,-7.59315 -3.0086,-2.43554 -9.31235,-2.43554 h -7.44989 q -2.43554,0 -4.01147,1.14614 -1.43267,1.00287 -2.14901,4.29801 -0.71633,3.15187 -0.71633,9.74215 v 57.73661 q 0,4.298 2.29227,6.30374 2.43554,1.86247 8.02295,3.29514 1.43267,0.4298 2.43554,1.00287 1.00287,0.57307 1.00287,1.86247 0,1.00287 -0.8596,1.57594 -0.8596,0.57307 -2.14901,0.57307 -3.15187,0 -7.16335,-0.28654 -3.86821,-0.14326 -7.87968,-0.28653 -3.86821,-0.14327 -6.73355,-0.14327 -3.00861,0 -6.87682,0.14327 -3.72494,0.14327 -7.59315,0.28653 -3.72494,0.28654 -7.02008,0.28654 z m 86.41863,1.57594 q -7.73642,0 -13.8969,-4.01148 -6.01722,-4.15474 -9.59889,-11.17483 -3.43841,-7.16335 -3.43841,-16.18917 0,-9.02582 4.15474,-16.33243 4.15475,-7.44989 11.3181,-11.7479 7.16335,-4.44128 15.75937,-4.44128 6.16048,0 11.03156,2.72208 4.87107,2.5788 7.73641,7.02008 3.00861,4.44128 3.00861,10.02869 0,5.44415 -4.44128,5.44415 h -28.6534 q -2.00573,0 -3.0086,1.14613 -0.8596,1.14614 -0.8596,3.86821 0,5.44415 2.43553,10.02869 2.43554,4.44128 6.59029,7.02008 4.15474,2.57881 9.59889,2.57881 4.15474,0 7.59315,-1.57594 3.58167,-1.57593 7.02008,-4.29801 0.57307,-0.4298 1.00287,-0.71633 0.57307,-0.4298 1.00287,-0.4298 1.43267,0 1.43267,1.86247 0,1.57594 -1.14614,4.29801 -1.43267,3.58167 -4.87108,7.16335 -3.29514,3.43841 -8.30948,5.58741 -5.01435,2.14901 -11.46136,2.14901 z m -7.02009,-44.69931 h 8.59602 q 4.01148,0 5.58742,-0.14326 1.57593,-0.14327 2.86534,-0.57307 0.71633,-0.28654 1.14613,-1.43267 0.4298,-1.14614 0.4298,-2.57881 0,-3.86821 -2.72207,-6.30375 -2.5788,-2.43554 -6.44701,-2.43554 -3.00861,0 -5.73068,1.71921 -2.57881,1.57594 -4.29801,4.29801 -1.57594,2.5788 -1.43267,5.44414 0,2.00574 2.00573,2.00574 z m 66.50444,44.69931 q -7.59315,0 -13.75363,-4.01148 -6.01722,-4.15474 -9.59889,-11.03156 -3.43841,-7.02008 -3.43841,-15.75937 0,-9.31235 4.29801,-16.76224 4.29801,-7.44988 11.46136,-11.89116 7.30662,-4.44128 16.18917,-4.44128 11.7479,0 19.48431,7.73642 1.28941,1.43267 1.28941,2.57881 0,0.8596 -1.28941,2.5788 -1.2894,1.57594 -2.86534,2.86534 -1.57593,1.28941 -2.72207,1.28941 -1.2894,0 -2.57881,-0.71634 -1.14613,-0.8596 -2.29227,-1.86247 -3.72494,-3.15187 -7.59315,-5.01434 -3.72494,-2.00574 -6.44701,-2.00574 -5.44415,0 -8.30949,4.58454 -2.72207,4.44128 -2.72207,14.61324 0,7.02008 2.149,12.17769 2.29227,5.01435 6.44702,7.73642 4.15474,2.72207 10.02869,2.72207 4.29801,0 7.44988,-1.2894 3.15188,-1.43267 6.59028,-4.29801 0.71634,-0.4298 1.14614,-0.8596 0.57307,-0.4298 1.2894,-0.4298 1.71921,0 1.71921,2.29227 0,0.57307 -0.28654,1.7192 -0.14327,1.00287 -0.8596,2.29227 -1.2894,2.86534 -5.01434,6.44702 -3.58168,3.58167 -8.59602,6.16048 -5.01435,2.57881 -11.17483,2.57881 z m 32.77943,-1.57594 q -2.86534,0 -2.86534,-2.00574 0,-1.86247 3.29514,-2.86534 2.149,-0.71633 3.72494,-1.57594 1.57594,-0.8596 1.7192,-4.01147 V 480.2869 q 0,-3.86821 -1.00286,-6.73355 -1.00287,-2.86534 -4.58455,-3.58168 -1.57594,-0.28653 -1.57594,-2.149 0,-1.86247 1.43267,-2.14901 3.29515,-0.71633 7.44989,-2.00573 4.29801,-1.43267 8.30948,-2.86534 4.01148,-1.57594 6.16049,-2.29227 1.14613,-0.42981 1.86247,-0.42981 0.8596,0 1.14613,0.57307 0.28654,0.4298 0.28654,1.14614 0,0.71633 -0.28654,2.149 -0.14327,1.28941 -0.28653,3.29514 -0.14327,1.86247 -0.28654,4.44128 v 33.09468 q 0,1.43267 0.14327,2.5788 0.14327,1.14614 0.71634,1.57594 2.149,-1.86247 5.15761,-4.01148 3.0086,-2.29227 6.87681,-4.01147 4.01148,-1.71921 8.88256,-1.71921 7.59315,0 12.75076,5.44415 5.15761,5.30088 5.15761,14.89977 v 31.2322 q 0,3.00861 1.57594,4.15475 1.57594,1.00287 3.58167,1.7192 1.57594,0.4298 2.29228,1.14614 0.8596,0.57306 0.8596,1.7192 0,2.00574 -3.15188,2.00574 -3.4384,0 -5.58741,-0.28654 -2.149,-0.14326 -4.15474,-0.28653 -1.86247,-0.14327 -4.87108,-0.14327 -3.15187,0 -4.87108,0.14327 -1.7192,0.14327 -3.58167,0.28653 -1.86247,0.28654 -5.30088,0.28654 -3.58168,0 -3.58168,-2.14901 0,-1.14613 0.85961,-1.7192 1.00286,-0.71634 2.149,-1.00287 1.86247,-0.71633 3.43841,-1.86247 1.57594,-1.14614 1.57594,-4.29801 v -28.2236 q 0,-3.15187 -1.28941,-5.58741 -1.2894,-2.57881 -3.43841,-4.01148 -2.00573,-1.57593 -4.44127,-1.57593 -2.14901,0 -4.72781,0.71633 -2.57881,0.71634 -5.01435,2.43554 -1.14613,0.8596 -1.57594,2.00574 -0.28653,1.00287 -0.28653,3.15187 v 31.37547 q 0,2.86534 1.43267,4.01148 1.43267,1.00287 3.29514,1.7192 1.2894,0.4298 2.14901,1.14614 0.8596,0.57307 0.8596,1.7192 0,2.14901 -2.57881,2.14901 -2.86534,0 -5.44414,-0.28654 -2.43554,-0.14326 -4.72781,-0.28653 -2.14901,-0.14327 -4.72781,-0.14327 -2.43554,0 -4.87108,0.14327 -2.29227,0.14327 -4.72781,0.28653 -2.43554,0.28654 -5.30088,0.28654 z"
+ id="path8" /><path
+ d="m 604.72815,740.17323 q -11.17482,0 -20.91698,-3.29514 -9.74216,-3.43841 -17.19204,-9.59889 -7.44988,-6.30374 -11.60463,-15.04303 -4.15474,-8.73929 -4.15474,-19.34105 0,-9.88542 3.86821,-18.76797 4.01147,-9.02582 11.60463,-15.90264 7.59315,-7.02008 18.1949,-11.03156 10.74503,-4.15474 24.21213,-4.15474 4.58454,0 9.16909,0.71633 4.72781,0.57307 9.02582,1.71921 4.44127,1.14613 8.02295,2.43554 1.2894,0.57306 2.149,1.57593 1.00287,0.85961 1.14614,2.57881 0.57307,4.72781 0.8596,9.16909 0.28653,4.44127 0.28653,8.02295 0,1.57594 -1.14613,2.149 -1.14614,0.57307 -2.57881,0.14327 -1.2894,-0.57307 -1.86247,-2.29227 -1.00287,-3.29514 -2.43554,-6.59028 -1.2894,-3.29514 -4.01147,-5.73068 -2.86534,-2.86534 -8.02295,-4.72781 -5.01435,-1.86247 -12.1777,-1.86247 -7.30662,0 -13.32383,3.15187 -5.87395,3.15187 -10.17196,8.59602 -4.15474,5.44415 -6.44701,12.32096 -2.29227,6.87682 -2.29227,14.3267 0,9.45562 2.00573,17.62184 2.00574,8.02295 6.16048,13.8969 4.15475,5.87395 10.17196,9.16909 6.01722,3.29514 14.18343,3.29514 10.60176,0 17.19204,-4.44128 6.59029,-4.58454 11.03156,-13.8969 1.14614,-2.5788 3.15188,-2.43553 2.149,0.14326 2.149,2.43553 0,1.86247 -0.4298,4.58455 -0.28653,2.5788 -1.00287,5.58741 -0.71633,3.00861 -1.7192,6.16048 -0.57307,1.71921 -1.57594,2.72207 -0.8596,0.85961 -2.29227,1.57594 -5.44415,2.29227 -12.89403,3.72494 -7.44988,1.43267 -16.33244,1.43267 z m 48.71073,-1.57593 q -1.28941,0 -2.14901,-0.4298 -0.71633,-0.57307 -0.71633,-1.57594 0,-1.14614 0.8596,-1.71921 0.8596,-0.71633 2.43554,-1.14613 2.149,-0.71634 3.72494,-1.57594 1.7192,-0.8596 1.7192,-3.86821 v -68.91142 q 0,-3.86821 -1.14613,-6.73355 -1.00287,-2.86534 -4.58455,-3.58168 -1.43267,-0.28653 -1.43267,-2.149 0,-1.86247 1.28941,-2.14901 3.72494,-0.71633 8.02295,-2.00574 4.29801,-1.43267 8.16622,-2.86534 3.86821,-1.57593 6.01721,-2.29227 1.14614,-0.4298 1.86247,-0.4298 0.8596,0 1.14614,0.57307 0.28653,0.4298 0.28653,1.14614 0,1.00286 -0.4298,3.72494 -0.28653,2.72207 -0.4298,6.16048 v 79.22665 q 0,3.15187 1.57594,4.01147 1.7192,0.71634 3.86821,1.43267 1.57593,0.57307 2.43554,1.14614 0.8596,0.57307 0.8596,1.7192 0,1.00287 -0.8596,1.57594 -0.71634,0.4298 -2.00574,0.4298 -2.72208,0 -5.44415,-0.14326 -2.5788,-0.14327 -5.15761,-0.14327 -2.43554,-0.14327 -5.01434,-0.14327 -2.43554,0 -4.87108,0.14327 -2.29227,0.14327 -4.72781,0.28653 -2.43554,0.28654 -5.30088,0.28654 z m 84.06909,2.5788 q -1.14613,0 -1.14613,-1.43267 0,-1.7192 0.28653,-4.58454 0.4298,-2.86534 0.4298,-4.44128 0,-0.57307 -0.14327,-1.00287 0,-0.4298 -0.14326,-0.57307 -3.86821,4.72782 -9.88542,8.02296 -6.01722,3.15187 -12.75077,3.15187 -4.44127,0 -8.02295,-2.57881 -3.58167,-2.72207 -5.73068,-7.30661 -2.00574,-4.58455 -2.00574,-10.31523 v -26.79092 q 0,-3.29515 -1.2894,-5.30088 -1.14614,-2.00574 -4.44128,-2.72208 -0.8596,-0.14326 -1.57593,-0.71633 -0.57307,-0.71634 -0.57307,-2.00574 0,-1.00287 0.57307,-1.57594 0.57306,-0.71633 1.57593,-0.8596 6.01722,-0.28653 10.88829,-1.14613 4.87108,-1.00287 9.88543,-2.29228 0.71633,-0.14326 1.43267,-0.28653 0.8596,-0.28653 1.57593,-0.28653 2.00574,0 1.86248,2.00573 -0.57307,3.29514 -0.85961,5.58742 -0.28653,2.149 -0.28653,5.44414 v 27.50727 q 0,3.4384 1.14614,6.01721 1.14613,2.57881 3.15187,4.01148 2.00574,1.43267 4.44128,1.57593 2.29227,0 4.44127,-0.57307 2.29228,-0.57306 4.29801,-2.5788 0.8596,-0.71634 1.86247,-2.86534 1.00287,-2.29227 1.00287,-6.01722 v -23.06598 q 0,-2.57881 -1.00287,-4.15474 -1.00287,-1.71921 -2.72207,-2.72208 -1.7192,-1.00287 -4.01147,-1.14613 -1.57594,-0.14327 -2.57881,-0.71634 -0.8596,-0.71633 -0.8596,-2.43554 0,-1.43267 1.00287,-2.149 1.00287,-0.71634 2.43554,-0.71634 7.30661,-0.4298 11.60462,-0.71633 4.29801,-0.4298 7.02008,-0.8596 2.72208,-0.42981 5.44415,-1.00287 0.4298,-0.14327 1.00287,-0.28654 0.57307,-0.14326 0.8596,-0.14326 2.14901,0 2.14901,1.7192 0,0.4298 -0.14327,1.00287 -0.14327,0.57307 -0.4298,1.14613 -0.14327,0.57307 -0.4298,2.57881 -0.14327,1.86247 -0.4298,4.01148 -0.14327,2.149 -0.14327,3.4384 v 33.23795 q 0,3.29514 0.71633,4.44127 0.85961,1.00287 1.86248,1.00287 0.71633,0 2.149,0.14327 1.43267,0 1.86247,0 1.2894,0 2.00574,0.71634 0.71633,0.71633 0.71633,1.86247 0,1.2894 -0.57306,2.149 -0.4298,0.71634 -1.86247,0.8596 -6.87682,0.57307 -12.46423,2.43554 -5.44415,1.71921 -9.45563,3.29514 -0.8596,0.28654 -1.86247,0.57307 -1.00287,0.4298 -1.86247,0.4298 z m 68.76825,-1.00287 q -4.15475,0 -7.73642,-0.71633 -3.43841,-0.71634 -6.30375,-1.43267 -2.149,-0.71634 -4.01147,-1.14614 -1.71921,-0.4298 -2.86534,-0.4298 -1.43267,0 -2.72208,0.57307 -1.2894,0.4298 -2.43554,1.2894 -1.2894,1.00287 -2.00573,1.00287 -1.28941,0 -2.00574,-0.57307 -0.57307,-0.57306 -0.57307,-1.2894 0,-1.2894 0.71633,-5.01434 0.85961,-3.72495 0.71634,-9.31236 l -0.57307,-63.75381 q 0,-3.72495 -1.14613,-6.59029 -1.00287,-3.0086 -4.44128,-3.72494 -0.71634,-0.14326 -1.2894,-0.71633 -0.42981,-0.57307 -0.42981,-1.57594 0,-0.71633 0.42981,-1.2894 0.4298,-0.57307 1.14613,-0.71634 3.15188,-0.57307 7.30662,-1.86247 4.15474,-1.43267 8.02295,-2.86534 4.01148,-1.57594 6.16048,-2.29227 1.43267,-0.57307 2.00574,-0.57307 0.8596,0 1.14614,0.57307 0.4298,0.4298 0.4298,1.14614 0,0.8596 -0.4298,3.58167 -0.28654,2.72207 -0.28654,5.44415 v 30.65913 q 0,1.86248 0.28654,3.00861 0.28653,1.00287 1.00286,1.00287 4.44128,-3.00861 9.16909,-4.58454 4.87108,-1.71921 9.16909,-1.71921 7.44988,0 13.4671,3.86821 6.01721,3.86821 9.45562,10.60176 3.58167,6.73355 3.58167,15.1863 0,10.02869 -4.44127,17.90838 -4.44128,7.73641 -12.32096,12.03442 -7.73642,4.29801 -18.19491,4.29801 z m 2.5788,-6.01721 q 3.86821,0 6.59028,-3.29514 2.72208,-3.43841 4.15475,-9.02582 1.57593,-5.58742 1.57593,-12.1777 0,-5.73068 -1.57593,-11.60462 -1.43267,-5.87395 -4.72781,-9.74216 -3.15188,-4.01148 -8.16622,-4.01148 -2.57881,0 -6.01722,0.85961 -3.4384,0.71633 -5.58741,2.43554 v 30.51587 q 0,4.58454 1.86247,8.30948 2.00574,3.72494 5.15761,5.73068 3.15188,2.00574 6.73355,2.00574 z"
+ id="path9" /></g><path
+ d="m 362.90082,400.17788 q -10.43013,-6.79171 -14.06854,-11.88549 -3.63842,-4.85122 2.91073,-8.97476 1.45537,-0.97024 4.60866,1.69793 3.39585,2.42561 5.5789,4.60866 4.85122,4.36609 11.88549,5.33634 7.27683,1.2128 16.25159,-1.21281 10.18756,-3.15329 17.70695,-8.73219 7.76196,-5.82147 14.55366,-14.06854 5.09378,-6.54915 7.03427,-14.06854 1.94049,-7.76195 1.45537,-14.3111 -0.24256,-6.54915 -2.66817,-9.21732 -6.06403,-8.48963 -16.97927,-11.64293 -10.67269,-3.39585 -25.22635,0.48513 -1.69792,0.24256 -5.09378,0.97024 -3.39585,0.72768 -6.06402,1.45537 -2.66817,0.48512 -2.91074,0.48512 -1.69792,0.48512 -2.66817,1.2128 -0.97024,0.48512 -2.42561,3.63842 -1.2128,2.91073 -3.88097,10.67268 -2.66817,7.51939 -8.00452,22.31561 -5.09378,14.79623 -8.24707,21.10281 -2.91073,6.06403 -5.33634,5.57891 -2.18305,-0.72769 -5.5789,-5.33635 -1.94049,-3.39585 -2.42561,-6.54914 -0.48513,-3.39586 1.94048,-7.76196 1.21281,-2.18305 1.94049,-3.88097 0.72768,-1.94049 1.94049,-6.54915 1.2128,-3.63841 4.60866,-12.61317 3.63841,-9.21732 8.48963,-21.34537 4.85122,-12.37061 10.18757,-25.46891 5.33634,-13.09829 10.18756,-24.74122 5.09378,-11.64293 8.48963,-19.64744 3.39586,-7.51939 4.12354,-10.91524 0.72768,-3.39586 -0.48512,-3.63842 0,-1.2128 -0.72768,-2.18305 -0.72769,-1.2128 -0.48513,-2.18305 0,-0.97024 3.1533,-2.66817 3.39585,-1.69793 7.27683,-3.15329 4.12353,-1.45537 6.30658,-0.97025 1.21281,0 2.91073,0 1.69793,-0.24256 1.69793,-1.2128 0.72768,0 4.60866,-0.48512 3.88098,-0.48512 8.48964,0 16.25158,1.45536 25.22634,9.45988 8.97476,7.76195 8.7322,21.34536 -0.24256,4.12354 -4.3661,11.15781 -3.88098,7.03427 -9.70244,14.06854 -5.5789,7.03427 -10.91525,11.88549 -3.15329,2.66817 -6.79171,5.5789 -3.39585,2.66817 -6.06402,4.60866 -2.42561,1.69793 -2.42561,1.69793 0,0 1.94049,0.72768 1.94049,0.72768 4.12353,1.45537 11.15781,4.12353 18.43464,10.43012 7.27683,6.30659 9.945,17.46439 0.97025,3.63842 0,8.97476 -0.72768,5.33634 -2.18305,10.67268 -1.45536,5.09378 -3.15329,8.7322 -1.69793,1.69793 -2.66817,3.63841 -0.97024,1.69793 -0.97024,1.69793 0,0.48512 -1.94049,3.88098 -1.94049,3.15329 -4.60866,7.03427 -2.66817,3.88097 -5.09378,6.79171 -2.42561,1.94048 -5.82147,4.60865 -3.15329,2.66818 -7.27683,5.09379 -3.88097,2.42561 -8.48963,4.12353 -6.79171,2.91073 -14.79622,3.88098 -7.76196,1.2128 -14.79623,0.24256 -7.03426,-0.72768 -11.40036,-3.39585 z m 11.88549,-93.38599 q 0,0 4.3661,-0.72768 4.60865,-0.97025 9.945,-1.94049 5.33634,-1.21281 7.76195,-2.18305 1.2128,-0.72768 3.39585,-1.94049 2.42561,-1.2128 4.85122,-3.63841 3.39586,-3.1533 8.48964,-8.97476 5.33634,-6.06403 10.43012,-12.61317 5.09378,-6.79171 7.76195,-12.12805 5.57891,-8.7322 6.06403,-12.85574 0.48512,-4.3661 -2.66817,-7.51939 -2.18305,-2.66817 -7.51939,-3.39585 -5.09379,-0.97025 -10.91525,-0.48512 -5.82146,0.24256 -9.945,1.45536 -3.15329,0.97025 -4.85122,2.42561 -1.69793,1.21281 -1.69793,3.88098 0,2.18305 -1.45536,4.3661 -1.21281,1.94048 -2.42561,3.15329 -0.24256,1.69793 -1.21281,3.15329 -0.97024,1.21281 -0.97024,1.21281 0,0.97024 -3.39586,8.00451 -3.39585,7.03427 -6.7917,16.25159 -4.3661,10.43012 -6.79171,16.97927 -2.42561,6.30658 -2.42561,7.51939 z m 131.46817,71.07037 q -5.09378,4.3661 -11.88548,5.09378 -6.54915,0.72769 -12.85574,-1.94048 -6.30658,-2.91074 -10.43012,-8.7322 -4.12354,-5.33634 -5.33634,-12.12805 -1.21281,-7.03427 -0.24256,-18.19208 0.72768,-9.45987 6.06402,-18.91975 5.33634,-9.70244 12.85573,-17.22184 7.76196,-7.51939 15.28135,-10.43012 3.63841,-2.42561 6.06402,-2.18305 2.66817,0 8.00452,0.48512 5.5789,0.72769 8.24707,2.18305 2.91073,1.45537 4.60866,3.88098 3.63841,3.63841 4.85122,7.27683 1.2128,3.39585 1.2128,6.79171 -0.97024,5.33634 -7.27683,13.09829 -6.06402,7.51939 -16.00902,12.37061 -5.33634,1.69793 -11.64293,1.45537 -6.30659,-0.24256 -10.43012,-3.15329 -4.60866,-1.94049 -6.06403,0.72768 -1.45536,2.42561 -2.66817,12.12805 -0.97024,9.21732 1.45537,13.58342 2.42561,4.12353 6.54914,4.85122 4.85122,0.97024 7.51939,1.45536 2.91074,0.24256 7.03427,-2.18305 3.88098,-2.42561 4.85122,-2.66817 0.97025,-0.48512 1.45537,-0.97024 0.72768,-0.72769 3.15329,-3.1533 1.69793,-1.69792 2.66817,-2.42561 0.97025,-0.97024 2.18305,-0.97024 1.21281,0 2.18305,1.21281 0.97025,0.97024 1.94049,1.45536 2.42561,0 0.97024,2.91073 -1.2128,2.91074 -5.09378,7.03427 -3.88097,3.88098 -9.21732,7.27683 z m -0.24256,-51.42293 q 2.66818,-1.2128 5.57891,-3.39585 2.91073,-2.42561 4.85122,-5.09379 2.18305,-2.91073 2.18305,-4.85122 0,-3.39585 -3.1533,-5.5789 -3.15329,-2.42561 -9.45988,-0.72768 -2.66817,0.72768 -6.06402,3.63841 -3.39586,2.66817 -6.54915,6.06403 -2.91073,3.39585 -4.85122,6.06402 -1.69793,2.66818 -1.2128,3.1533 0.72768,1.2128 4.12353,1.94049 3.39586,0.48512 7.51939,0.24256 4.3661,-0.24256 7.03427,-1.45537 z m 55.54667,58.21464 q -2.66817,-0.48512 -5.57891,-2.66817 -2.66817,-2.42561 -4.85122,-5.33634 -1.94048,-3.1533 -2.66817,-5.57891 0,-0.48512 -0.72768,-1.2128 -0.48512,-0.72768 -0.48512,-0.72768 -0.97025,-0.72769 -1.21281,-6.30659 0,-5.82146 0.72769,-12.85573 0.72768,-7.03427 1.69792,-11.15781 1.21281,-3.88097 3.63842,-10.43012 2.42561,-6.79171 4.12353,-12.12805 l 6.54915,-14.06854 -9.70244,-2.66817 q -1.69793,-0.48512 -2.91073,-1.94049 -0.97024,-1.45537 -0.97024,-2.42561 0,-1.94049 2.18304,-4.60866 2.18305,-2.91073 3.1533,-2.91073 1.2128,0.24256 4.3661,0.24256 3.39585,0 6.54914,-0.24256 3.1533,-0.24256 3.88098,-0.48512 0.97024,-0.48512 1.94049,-1.21281 0.97024,-0.97024 1.45536,-2.66817 1.21281,-2.66817 2.18305,-4.85122 0.97025,-2.42561 2.66817,-5.33634 1.69793,-3.15329 2.66817,-5.33634 1.21281,-2.18305 3.63842,-6.06403 1.2128,-1.69793 2.66817,-4.12354 1.45537,-2.42561 3.63842,-4.12353 2.18304,-1.94049 4.36609,-1.69793 2.42561,0 6.06403,3.15329 1.94049,2.42561 2.18305,3.63842 0.24256,1.2128 -1.94049,4.60866 -1.94049,4.12353 -4.60866,8.24707 -2.42561,4.12354 -4.60866,8.24708 -3.88097,5.33634 -1.45536,6.06402 2.42561,0.72768 13.58341,-0.97024 7.03427,-1.21281 10.18756,0.72768 3.1533,1.69793 3.63842,5.82146 0.72768,5.82147 -1.21281,7.03427 -1.94048,1.21281 -11.1578,1.21281 -5.82147,0.97024 -9.945,1.2128 -4.12354,0 -6.06403,0 -3.15329,0.24256 -4.12354,0.24256 -0.97024,0 -2.91073,0.48513 -1.94049,0.48512 -2.91073,1.69792 -0.72768,0.97025 -1.69793,2.91074 -0.97024,0.97024 -2.91073,5.09378 -1.94049,4.12353 -4.85122,8.97475 -3.39585,10.18757 -5.82146,20.37513 -2.42561,9.945 -3.88098,19.40488 -0.97024,6.06402 0.24256,8.48963 1.21281,2.18305 6.30659,2.66817 2.66817,0.24257 8.48963,0 6.06403,-0.48512 9.45988,-1.45536 2.66817,-1.21281 5.57891,-2.42561 2.91073,-1.45537 5.33634,-2.91073 2.18305,-1.21281 4.3661,-2.42561 2.18304,-1.45537 2.18304,-1.45537 1.21281,-1.94049 2.66818,-1.2128 1.45536,0.72768 2.42561,3.63841 0,2.91073 -1.21281,6.06403 -1.2128,3.15329 -8.97476,7.51939 -10.91524,6.79171 -20.13256,8.24707 -8.97476,1.21281 -15.28134,0 z m 91.44534,1.21281 q -3.39585,-0.97025 -5.5789,-2.18305 -2.18305,-1.45537 -5.82147,-4.60866 -2.91073,-3.88098 -4.60866,-7.27683 -1.45536,-3.39586 -1.94048,-7.76195 -0.48513,-4.60866 -0.48513,-11.64293 0,-2.91073 0.97025,-8.7322 1.2128,-5.82146 2.66817,-12.12805 1.69793,-6.54915 2.91073,-11.64293 1.45537,-5.09378 1.69793,-6.54914 0.72768,-3.1533 -2.42561,-3.63842 -3.1533,-0.48512 -7.03427,-0.24256 -3.63842,0 -4.85122,-0.72768 -0.97025,-0.24256 -0.97025,-0.72769 0,-0.72768 0,-0.72768 0,-0.97024 -0.24256,-1.2128 0,-0.48513 -0.72768,-1.69793 -0.48512,-0.97025 0.48512,-2.66817 1.21281,-1.94049 3.88098,-2.42561 2.18305,-0.48512 5.82146,-0.72769 3.88098,-0.48512 7.76195,-1.69792 3.88098,-1.45537 6.30659,-4.3661 2.18305,-5.33634 5.09378,-11.88549 2.91073,-6.54915 5.57891,-11.64293 2.91073,-5.33634 3.88097,-6.54915 4.12354,-2.18304 6.06403,-1.69792 1.94048,0.24256 4.36609,4.12353 1.21281,1.69793 1.69793,2.66818 0.72768,0.97024 0.24256,2.91073 -0.48512,1.94049 -2.66817,6.06402 -1.94049,4.12354 -6.06402,11.88549 -1.21281,2.42561 -2.18305,4.3661 -0.97025,1.69793 -0.97025,1.69793 0.97025,0.24256 2.91074,0.24256 1.94048,0 4.85122,-0.24256 2.66817,-0.48512 6.7917,-0.72769 4.12354,-0.48512 6.54915,0 5.5789,0 8.24707,2.18305 2.66818,1.94049 2.91074,6.79171 0.48512,2.66817 -1.21281,3.15329 -1.45536,0.48513 -8.00451,0.48513 -2.18305,0 -6.79171,0.24256 -4.60866,0.24256 -9.70244,0.48512 -4.85122,0.24256 -8.48963,0.72768 -3.39586,0.24256 -3.39586,0.72769 -0.72768,0.48512 -2.42561,4.60865 -1.45537,4.12354 -3.15329,9.45988 -1.45537,5.09379 -2.66817,9.21732 -1.69793,8.24708 -2.66817,16.49415 -0.72769,8.24707 -0.24257,14.3111 0.48513,6.06402 2.66818,8.48963 2.18304,2.18305 8.48963,0.97025 6.30659,-1.45537 10.18756,-4.60866 4.3661,-3.63842 7.03427,-3.63842 2.91073,0 3.1533,2.66818 0.48512,2.42561 -2.66818,7.03426 -2.91073,4.3661 -7.27683,7.76196 -4.36609,3.15329 -9.21731,4.60866 -4.60866,1.2128 -8.7322,0 z m 73.25327,1.2128 q -10.67269,0 -17.46439,-8.00451 -6.79171,-8.24708 -6.54915,-20.37513 0.48512,-8.73219 3.39585,-18.67719 3.1533,-10.18757 8.24708,-19.40488 5.09378,-9.45988 11.1578,-16.49415 6.06403,-7.03427 12.61317,-9.945 2.42561,-1.21281 5.09379,-1.94049 2.91073,-0.72768 5.82146,-0.72768 2.66817,0 5.5789,0.97024 2.91073,0.72768 4.85122,1.69793 4.12354,1.69792 6.30659,4.12353 2.18305,2.42561 3.88098,7.51939 0.72768,4.60866 0.72768,6.54915 0,1.94049 -1.21281,5.82147 -2.91073,8.73219 -7.51939,15.03878 -4.60866,6.30658 -12.37061,10.67268 -1.94049,1.21281 -4.60866,1.94049 -2.42561,0.48512 -5.09378,0.48512 -4.85122,0 -9.45988,-1.69792 -4.3661,-1.94049 -7.03427,-5.57891 l -1.69792,-1.94049 -0.72769,1.94049 q -2.42561,6.54915 -3.88097,12.12805 -1.21281,5.57891 -1.21281,10.18756 0,2.91074 0.48512,5.57891 0.72769,2.66817 1.94049,4.60866 0.97025,1.45536 3.15329,2.18305 2.42561,0.48512 5.09379,0.48512 1.69792,0 3.39585,0 1.94049,-0.24256 3.63841,-0.97025 4.12354,-1.45536 6.54915,-3.15329 2.66817,-1.69793 5.33634,-3.63841 l 0.97025,-0.48513 h -0.24256 q 2.91073,-1.45536 5.09378,-2.91073 2.42561,-1.45536 2.42561,-1.45536 0.97024,0 1.94049,-1.21281 1.94048,-0.97024 4.85122,0.72768 3.15329,1.69793 3.15329,4.3661 -0.24256,1.21281 -2.18305,3.88098 -1.94049,2.42561 -4.3661,4.60866 -2.18305,2.18305 -3.63841,2.42561 -0.24256,0.24256 -1.69793,0.97024 -1.45537,0.48512 -1.94049,0.97025 h 0.24256 q -2.18305,2.91073 -4.3661,2.91073 h -1.94048 q -0.97025,1.69792 -6.30659,3.88097 -5.33634,1.94049 -10.43012,1.94049 z m 10.91524,-53.36342 q 4.3661,0 7.51939,-2.42561 3.39586,-2.66817 5.82147,-5.82146 4.85122,-6.54915 5.5789,-12.61318 0.97024,-6.30658 -1.45537,-8.73219 -1.45536,-0.72769 -2.66817,-0.72769 -0.97024,-0.24256 -4.12353,0.72769 -2.18305,0.48512 -6.06403,3.63841 -3.88097,3.1533 -7.76195,7.03427 -3.63842,3.88098 -5.5789,6.54915 l -3.1533,5.09378 q 1.94049,-0.72768 3.63842,-0.72768 1.94049,-0.24256 2.18305,0.24256 0,2.18305 0.72768,4.12354 0.97024,1.69792 2.18305,2.66817 1.45537,0.97024 3.15329,0.97024 z m 56.75947,47.05684 q -1.2128,2.42561 -3.63841,1.45536 -2.18305,-0.97024 -3.63842,-1.94049 -1.69793,0 -2.91073,-0.97024 -1.21281,-0.97024 -1.69793,-2.91073 -0.48512,-1.45537 -0.24256,-3.39586 0.24256,-2.18305 0.97024,-4.85122 0.97025,-2.91073 1.94049,-6.30658 1.94049,-8.00452 2.66817,-11.64293 0.72769,-3.63842 1.45537,-6.30659 0.72768,-2.66817 1.94049,-7.76195 1.94049,-4.85122 3.15329,-9.45988 1.21281,-4.60866 3.63842,-9.21732 1.69792,-6.30658 4.12353,-11.88549 2.66817,-5.82146 5.09378,-9.70244 0.48513,-0.72768 1.69793,-1.94048 1.45537,-1.21281 2.42561,-1.21281 1.94049,-1.94049 3.39586,-1.45537 1.69792,0.24257 4.12353,2.18305 2.91073,3.1533 2.18305,7.27683 -0.48512,4.12354 -5.82146,12.12805 -2.91073,7.51939 -5.33634,13.0983 -2.42562,5.33634 -3.39586,10.18756 2.66817,-3.88098 5.82147,-7.03427 3.39585,-3.39585 5.5789,-5.5789 5.33634,-5.33634 8.73219,-7.76195 3.63842,-2.42561 8.48964,-5.57891 2.91073,-1.94049 5.5789,-3.39585 2.66817,-1.69793 5.82147,-2.42561 3.39585,-0.72768 7.27683,0 2.42561,-0.24256 3.88097,1.45536 1.69793,1.69793 2.66817,4.60866 0.97025,2.91074 1.21281,6.79171 -5.5789,-1.2128 -9.945,0.48512 -4.3661,1.45537 -7.51939,3.63842 -2.91074,2.18305 -4.60866,3.39585 -3.63842,2.42561 -9.21732,6.54915 -5.5789,3.88098 -11.15781,9.45988 -4.36609,4.85122 -7.51939,8.24707 -2.91073,3.39586 -4.85122,6.06403 -1.69793,2.66817 -2.66817,5.5789 -2.42561,5.5789 -5.09378,12.12805 -2.66817,6.54915 -4.60866,8.00452 z"
+ id="text4"
+ style="font-size:242.561px;line-height:1.25;font-family:Caveat;-inkscape-font-specification:'Caveat, Normal';fill:#fac036;stroke-width:1.69307"
+ transform="rotate(-15)"
+ aria-label="Better" /><path
+ d="m 150.88794,368.4693 c 7.31554,-2.00094 18.83461,-5.04469 34.36407,-8.65975 13.05626,-3.03757 27.18717,-6.07186 42.6891,-9.10242 4.8934,-0.95611 9.8388,-1.89523 14.83747,-2.8172 9.88311,-1.82286 21.28291,-3.82014 34.15686,-5.89576 15.38054,-2.47835 32.31787,-4.98013 50.6507,-7.34484 14.65599,-1.88907 29.99427,-3.66403 45.85765,-5.21938 12.25521,-1.20021 24.67246,-2.25533 37.19864,-3.09997 10.12954,-0.68148 20.08581,-1.21018 29.93743,-1.54329 7.71104,-0.25917 15.00954,-0.38748 22.06882,-0.3667 6.67163,0.0217 12.56499,0.1727 18.04391,0.45452 5.51563,0.2865 9.54696,0.65139 12.61841,0.99447 a 8.7803873,8.7803873 90 0 0 1.94942,-17.45224 c -3.41735,-0.38172 -7.79502,-0.77488 -13.66132,-1.07959 -5.81007,-0.29886 -11.98914,-0.45533 -18.89595,-0.47785 -7.31018,-0.0215 -14.82552,0.11142 -22.71495,0.37659 -10.08011,0.34084 -20.23422,0.88062 -30.52587,1.57302 -12.72868,0.85828 -25.3244,1.92892 -37.73113,3.14397 -16.06081,1.57471 -31.57723,3.37048 -46.39075,5.27986 -18.53118,2.39029 -35.65144,4.91909 -51.1994,7.42442 -13.01484,2.09833 -24.54502,4.11837 -34.54769,5.96328 -5.05877,0.93306 -10.06493,1.8837 -15.02062,2.85199 -15.69802,3.0689 -30.03254,6.14643 -43.30111,9.2334 -15.79087,3.67591 -27.53122,6.77745 -35.01671,8.82487 a 8.7803873,8.7803873 90 0 0 4.63302,16.9386 z"
+ id="path-1"
+ style="fill:#fac036;fill-opacity:1;fill-rule:nonzero;stroke:#ffcc00;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+ transform="translate(362.34816,24.840675)" /></g><g
+ id="g6"
+ transform="matrix(3.6714119,0,0,3.6714119,-3645.4352,278.54007)"><path
+ fill="#fac036"
+ d="m 1108.66,32.68 c -4.62,-8.6 -7.22,-13.43 -12.79,-20.46 -5.56,-7.03 -12.14,-14.07 -19.5,-7.78 -3.72,3.17 -2.6,8.21 0.17,13.22 -0.47,-0.31 0.43,2.16 -0.01,1.83 -8.35,-6.37 -10.13,-5.67 -13.01,-3.39 -6.84,5.41 4.96,16.47 8.81,22.4 0.66,1.02 3.07,1.97 3.64,2.91 0.39,0.64 0.76,1.26 1.11,1.86 -0.43,-0.13 -0.87,-0.26 -1.32,-0.39 -4.04,-1.13 -13.32,-2.35 -17.54,-0.76 -26.18,9.88 -24.86,14.19 -22.85,19.85 2.01,5.66 9.35,9.84 21.35,2.38 14.81,-6.12 27.11,2.08 27.11,10.6 0,11.7 -3.83,18.31 -13.88,18.31 -15.89,0 -16.74,-12.96 -25.23,-21.45 -2.29,-2.29 -7.79,-2.96 -11.04,-0.61 -7.58,5.49 -2.68,16.88 -0.79,20.69 3.96,7.97 8.84,19.53 21.69,29.95 6.76,5.48 23.53,4.64 33.23,2.66 18.44,-3.76 22.15,-16.01 28.07,-36.98 2.23,-7.89 2.53,-14.24 2.53,-23.05 0,-8.81 -5.45,-23.78 -9.75,-31.79 z"
+ id="path1" /><path
+ fill="#e48c15"
+ d="m 1108.3,60.49 c -1.18,-5.04 -10.83,-12.92 -14.85,-15.52 -0.41,-2.2 -6.34,-15.14 -10.18,-20.25 -2.13,-2.84 -6.07,-6.68 -7.46,-8.44 0,0 0.34,1.39 -0.65,2.19 0.38,0.46 6.15,7.73 8.55,13.13 2.4,5.4 4.39,11.24 4.39,11.24 -2.61,-0.87 -12.93,-4.33 -15.78,-4.34 0,0 1,0.9 0.98,2.56 -0.02,1.55 -2.17,0.73 -0.98,1.08 7.62,2.21 18.26,4.85 24.82,11.13 2.59,2.49 6.42,7.22 8.22,10.33 1.3,2.22 3.26,-1.74 2.94,-3.11 z"
+ id="path2" /></g></svg>index 3a81c0d..b876ba3 100644
--- a/site.webmanifest
+++ b/site.webmanifest
@@ -1,6 +1,6 @@
={
- "name": "FOSS for Normies",
- "short_name": "fossfor.eu",
+ "name": "Better Tech Club",
+ "short_name": "Better Tech Club",
= "icons": [
= {
= "src": "/web-app-manifest-192x192.png",
@@ -15,7 +15,7 @@
= "purpose": "maskable"
= }
= ],
- "theme_color": "#003399",
- "background_color": "#003399",
+ "theme_color": "#fac036",
+ "background_color": "#25476a",
= "display": "standalone"
=}
\ No newline at end of fileindex eb84864..811f1c6 100644
Binary files a/web-app-manifest-192x192.png and b/web-app-manifest-192x192.png differindex 9e971f4..d09831b 100644
Binary files a/web-app-manifest-512x512.png and b/web-app-manifest-512x512.png differUpdate Nix dependencies
index a92871e..9a8b7f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
= ]
= },
= "locked": {
- "lastModified": 1760971495,
- "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
+ "lastModified": 1767714506,
+ "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=",
= "owner": "cachix",
= "repo": "cachix",
- "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
+ "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9",
= "type": "github"
= },
= "original": {
@@ -33,24 +33,143 @@
= "type": "github"
= }
= },
- "devenv": {
+ "cachix_2": {
= "inputs": {
- "cachix": "cachix",
+ "devenv": [
+ "devenv",
+ "crate2nix"
+ ],
+ "flake-compat": [
+ "devenv",
+ "crate2nix"
+ ],
+ "git-hooks": "git-hooks",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1767714506,
+ "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=",
+ "owner": "cachix",
+ "repo": "cachix",
+ "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "cachix",
+ "type": "github"
+ }
+ },
+ "cachix_3": {
+ "inputs": {
+ "devenv": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable"
+ ],
+ "flake-compat": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable"
+ ],
+ "git-hooks": "git-hooks_2",
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
+ "lastModified": 1767714506,
+ "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=",
+ "owner": "cachix",
+ "repo": "cachix",
+ "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "cachix",
+ "type": "github"
+ }
+ },
+ "crate2nix": {
+ "inputs": {
+ "cachix": "cachix_2",
+ "crate2nix_stable": "crate2nix_stable",
+ "devshell": "devshell_2",
+ "flake-compat": "flake-compat_2",
+ "flake-parts": "flake-parts_2",
+ "nix-test-runner": "nix-test-runner_2",
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ],
+ "pre-commit-hooks": "pre-commit-hooks_2"
+ },
+ "locked": {
+ "lastModified": 1772186516,
+ "narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=",
+ "owner": "rossng",
+ "repo": "crate2nix",
+ "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rossng",
+ "repo": "crate2nix",
+ "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
+ "type": "github"
+ }
+ },
+ "crate2nix_stable": {
+ "inputs": {
+ "cachix": "cachix_3",
+ "crate2nix_stable": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable"
+ ],
+ "devshell": "devshell",
= "flake-compat": "flake-compat",
= "flake-parts": "flake-parts",
- "git-hooks": "git-hooks",
+ "nix-test-runner": "nix-test-runner",
+ "nixpkgs": "nixpkgs_3",
+ "pre-commit-hooks": "pre-commit-hooks"
+ },
+ "locked": {
+ "lastModified": 1769627083,
+ "narHash": "sha256-SUuruvw1/moNzCZosHaa60QMTL+L9huWdsCBN6XZIic=",
+ "owner": "nix-community",
+ "repo": "crate2nix",
+ "rev": "7c33e664668faecf7655fa53861d7a80c9e464a2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "ref": "0.15.0",
+ "repo": "crate2nix",
+ "type": "github"
+ }
+ },
+ "devenv": {
+ "inputs": {
+ "cachix": "cachix",
+ "crate2nix": "crate2nix",
+ "flake-compat": "flake-compat_3",
+ "flake-parts": "flake-parts_3",
+ "git-hooks": "git-hooks_3",
= "nix": "nix",
= "nixd": "nixd",
= "nixpkgs": [
= "nixpkgs"
- ]
+ ],
+ "rust-overlay": "rust-overlay"
= },
= "locked": {
- "lastModified": 1770648178,
- "narHash": "sha256-vq9yrCTzM39gX4Ljmak2+OQFnF39C411JzT5hDNxVPA=",
+ "lastModified": 1775566203,
+ "narHash": "sha256-bBhX1xIB0rJ43xKZWzFaY1dQxOX6BcsdU4/+jpuaHcY=",
= "owner": "cachix",
= "repo": "devenv",
- "rev": "656d347597eaf914af4dbcb78248c1cc4db785f9",
+ "rev": "e82d5cbf38954a872c0547a0c141e8cc116d2b2a",
= "type": "github"
= },
= "original": {
@@ -59,14 +178,87 @@
= "type": "github"
= }
= },
+ "devshell": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1768818222,
+ "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
+ "owner": "numtide",
+ "repo": "devshell",
+ "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "devshell",
+ "type": "github"
+ }
+ },
+ "devshell_2": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1768818222,
+ "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
+ "owner": "numtide",
+ "repo": "devshell",
+ "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "devshell",
+ "type": "github"
+ }
+ },
= "flake-compat": {
+ "locked": {
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "revCount": 69,
+ "type": "tarball",
+ "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+ }
+ },
+ "flake-compat_2": {
+ "locked": {
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "revCount": 69,
+ "type": "tarball",
+ "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+ }
+ },
+ "flake-compat_3": {
= "flake": false,
= "locked": {
- "lastModified": 1761588595,
- "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+ "lastModified": 1767039857,
+ "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
= "owner": "edolstra",
= "repo": "flake-compat",
- "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+ "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
= "type": "github"
= },
= "original": {
@@ -79,15 +271,39 @@
= "inputs": {
= "nixpkgs-lib": [
= "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1768135262,
+ "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "devenv",
+ "crate2nix",
= "nixpkgs"
= ]
= },
= "locked": {
- "lastModified": 1760948891,
- "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+ "lastModified": 1768135262,
+ "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
= "owner": "hercules-ci",
= "repo": "flake-parts",
- "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+ "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
= "type": "github"
= },
= "original": {
@@ -96,18 +312,24 @@
= "type": "github"
= }
= },
- "flake-root": {
+ "flake-parts_3": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "devenv",
+ "nixpkgs"
+ ]
+ },
= "locked": {
- "lastModified": 1723604017,
- "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
- "owner": "srid",
- "repo": "flake-root",
- "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
+ "lastModified": 1772408722,
+ "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
= "type": "github"
= },
= "original": {
- "owner": "srid",
- "repo": "flake-root",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
= "type": "github"
= }
= },
@@ -115,20 +337,82 @@
= "inputs": {
= "flake-compat": [
= "devenv",
+ "crate2nix",
+ "cachix",
= "flake-compat"
= ],
= "gitignore": "gitignore",
= "nixpkgs": [
= "devenv",
+ "crate2nix",
+ "cachix",
= "nixpkgs"
= ]
= },
= "locked": {
- "lastModified": 1760663237,
- "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+ "lastModified": 1765404074,
+ "narHash": "sha256-+ZDU2d+vzWkEJiqprvV5PR26DVFN2vgddwG5SnPZcUM=",
= "owner": "cachix",
= "repo": "git-hooks.nix",
- "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+ "rev": "2d6f58930fbcd82f6f9fd59fb6d13e37684ca529",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "git-hooks_2": {
+ "inputs": {
+ "flake-compat": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "cachix",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore_2",
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "cachix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1765404074,
+ "narHash": "sha256-+ZDU2d+vzWkEJiqprvV5PR26DVFN2vgddwG5SnPZcUM=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "2d6f58930fbcd82f6f9fd59fb6d13e37684ca529",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "git-hooks_3": {
+ "inputs": {
+ "flake-compat": [
+ "devenv",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore_5",
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1772893680,
+ "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
= "type": "github"
= },
= "original": {
@@ -138,6 +422,102 @@
= }
= },
= "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "cachix",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_2": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "cachix",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_3": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "pre-commit-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_4": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "pre-commit-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_5": {
= "inputs": {
= "nixpkgs": [
= "devenv",
@@ -185,11 +565,11 @@
= ]
= },
= "locked": {
- "lastModified": 1770395975,
- "narHash": "sha256-zg0AEZn8d4rqIIsw5XrkVL5p1y6fBj2L57awfUg+gNA=",
+ "lastModified": 1774103430,
+ "narHash": "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=",
= "owner": "cachix",
= "repo": "nix",
- "rev": "ccb6019ce2bd11f5de5fe4617c0079d8cb1ed057",
+ "rev": "e127c1c94cefe02d8ca4cca79ef66be4c527510e",
= "type": "github"
= },
= "original": {
@@ -199,13 +579,44 @@
= "type": "github"
= }
= },
+ "nix-test-runner": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1588761593,
+ "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=",
+ "owner": "stoeffel",
+ "repo": "nix-test-runner",
+ "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "stoeffel",
+ "repo": "nix-test-runner",
+ "type": "github"
+ }
+ },
+ "nix-test-runner_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1588761593,
+ "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=",
+ "owner": "stoeffel",
+ "repo": "nix-test-runner",
+ "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "stoeffel",
+ "repo": "nix-test-runner",
+ "type": "github"
+ }
+ },
= "nixd": {
= "inputs": {
= "flake-parts": [
= "devenv",
= "flake-parts"
= ],
- "flake-root": "flake-root",
= "nixpkgs": [
= "devenv",
= "nixpkgs"
@@ -213,11 +624,11 @@
= "treefmt-nix": "treefmt-nix"
= },
= "locked": {
- "lastModified": 1763964548,
- "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=",
+ "lastModified": 1773634079,
+ "narHash": "sha256-49qb4QNMv77VOeEux+sMd0uBhPvvHgVc0r938Bulvbo=",
= "owner": "nix-community",
= "repo": "nixd",
- "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e",
+ "rev": "8ecf93d4d93745e05ea53534e8b94f5e9506e6bd",
= "type": "github"
= },
= "original": {
@@ -227,15 +638,80 @@
= }
= },
= "nixpkgs": {
+ "locked": {
+ "lastModified": 1765186076,
+ "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-src": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1773840656,
+ "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1765186076,
+ "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1769433173,
+ "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
= "inputs": {
= "nixpkgs-src": "nixpkgs-src"
= },
= "locked": {
- "lastModified": 1770434727,
- "narHash": "sha256-YzOZRgiqIccnkkZvckQha7wvOfN2z50xEdPvfgu6sf8=",
+ "lastModified": 1774287239,
+ "narHash": "sha256-W3krsWcDwYuA3gPWsFA24YAXxOFUL6iIlT6IknAoNSE=",
= "owner": "cachix",
= "repo": "devenv-nixpkgs",
- "rev": "8430f16a39c27bdeef236f1eeb56f0b51b33d348",
+ "rev": "fa7125ea7f1ae5430010a6e071f68375a39bd24c",
= "type": "github"
= },
= "original": {
@@ -245,30 +721,92 @@
= "type": "github"
= }
= },
- "nixpkgs-src": {
- "flake": false,
+ "pre-commit-hooks": {
+ "inputs": {
+ "flake-compat": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore_3",
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "crate2nix_stable",
+ "nixpkgs"
+ ]
+ },
= "locked": {
- "lastModified": 1769922788,
- "narHash": "sha256-H3AfG4ObMDTkTJYkd8cz1/RbY9LatN5Mk4UF48VuSXc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "207d15f1a6603226e1e223dc79ac29c7846da32e",
+ "lastModified": 1769069492,
+ "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
= "type": "github"
= },
= "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "type": "github"
+ }
+ },
+ "pre-commit-hooks_2": {
+ "inputs": {
+ "flake-compat": [
+ "devenv",
+ "crate2nix",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore_4",
+ "nixpkgs": [
+ "devenv",
+ "crate2nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1769069492,
+ "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
= "type": "github"
= }
= },
= "root": {
= "inputs": {
= "devenv": "devenv",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_4",
= "systems": "systems"
= }
= },
+ "rust-overlay": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1773630837,
+ "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
= "systems": {
= "locked": {
= "lastModified": 1681028828,
@@ -293,11 +831,11 @@
= ]
= },
= "locked": {
- "lastModified": 1734704479,
- "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
+ "lastModified": 1772660329,
+ "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=",
= "owner": "numtide",
= "repo": "treefmt-nix",
- "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
+ "rev": "3710e0e1218041bbad640352a0440114b1e10428",
= "type": "github"
= },
= "original": {Add tbb to the development shell
index 9a8b7f9..f1c3398 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,6 +91,43 @@
= "type": "github"
= }
= },
+ "cachix_4": {
+ "inputs": {
+ "devenv": [
+ "tad-better-behavior",
+ "devenv"
+ ],
+ "flake-compat": [
+ "tad-better-behavior",
+ "devenv",
+ "flake-compat"
+ ],
+ "git-hooks": [
+ "tad-better-behavior",
+ "devenv",
+ "git-hooks"
+ ],
+ "nixpkgs": [
+ "tad-better-behavior",
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1760971495,
+ "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
+ "owner": "cachix",
+ "repo": "cachix",
+ "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "cachix",
+ "type": "github"
+ }
+ },
= "crate2nix": {
= "inputs": {
= "cachix": "cachix_2",
@@ -178,6 +215,32 @@
= "type": "github"
= }
= },
+ "devenv_2": {
+ "inputs": {
+ "cachix": "cachix_4",
+ "flake-compat": "flake-compat_4",
+ "flake-parts": "flake-parts_4",
+ "git-hooks": "git-hooks_4",
+ "nix": "nix_2",
+ "nixpkgs": [
+ "tad-better-behavior",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1762889687,
+ "narHash": "sha256-oKvHfeYDZ0LfuHSaFLA0w/dfZ9R6C5W8pCGUjUWawGI=",
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "3b4fb549962342c928aae1bbea3a13f0eeed2703",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
= "devshell": {
= "inputs": {
= "nixpkgs": [
@@ -267,6 +330,22 @@
= "type": "github"
= }
= },
+ "flake-compat_4": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1761588595,
+ "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
= "flake-parts": {
= "inputs": {
= "nixpkgs-lib": [
@@ -333,6 +412,28 @@
= "type": "github"
= }
= },
+ "flake-parts_4": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "tad-better-behavior",
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1760948891,
+ "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
= "git-hooks": {
= "inputs": {
= "flake-compat": [
@@ -421,6 +522,34 @@
= "type": "github"
= }
= },
+ "git-hooks_4": {
+ "inputs": {
+ "flake-compat": [
+ "tad-better-behavior",
+ "devenv",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore_6",
+ "nixpkgs": [
+ "tad-better-behavior",
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1760663237,
+ "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
= "gitignore": {
= "inputs": {
= "nixpkgs": [
@@ -539,6 +668,29 @@
= "type": "github"
= }
= },
+ "gitignore_6": {
+ "inputs": {
+ "nixpkgs": [
+ "tad-better-behavior",
+ "devenv",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
= "nix": {
= "inputs": {
= "flake-compat": [
@@ -611,6 +763,52 @@
= "type": "github"
= }
= },
+ "nix_2": {
+ "inputs": {
+ "flake-compat": [
+ "tad-better-behavior",
+ "devenv",
+ "flake-compat"
+ ],
+ "flake-parts": [
+ "tad-better-behavior",
+ "devenv",
+ "flake-parts"
+ ],
+ "git-hooks-nix": [
+ "tad-better-behavior",
+ "devenv",
+ "git-hooks"
+ ],
+ "nixpkgs": [
+ "tad-better-behavior",
+ "devenv",
+ "nixpkgs"
+ ],
+ "nixpkgs-23-11": [
+ "tad-better-behavior",
+ "devenv"
+ ],
+ "nixpkgs-regression": [
+ "tad-better-behavior",
+ "devenv"
+ ]
+ },
+ "locked": {
+ "lastModified": 1761648602,
+ "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=",
+ "owner": "cachix",
+ "repo": "nix",
+ "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "devenv-2.30.6",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
= "nixd": {
= "inputs": {
= "flake-parts": [
@@ -783,7 +981,8 @@
= "inputs": {
= "devenv": "devenv",
= "nixpkgs": "nixpkgs_4",
- "systems": "systems"
+ "systems": "systems",
+ "tad-better-behavior": "tad-better-behavior"
= }
= },
= "rust-overlay": {
@@ -822,6 +1021,43 @@
= "type": "github"
= }
= },
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
+ "tad-better-behavior": {
+ "inputs": {
+ "devenv": "devenv_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1775133254,
+ "narHash": "sha256-orxwlnOwsWqRtZaYvt6Tu6l0Pdp9okpVZBaW/+gND2g=",
+ "ref": "refs/heads/main",
+ "rev": "fbf91ce2b8ebab992a7cbac5bf8ca91115985aea",
+ "revCount": 161,
+ "type": "git",
+ "url": "http://codeberg.org/tad-lispy/tad-better-behavior"
+ },
+ "original": {
+ "type": "git",
+ "url": "http://codeberg.org/tad-lispy/tad-better-behavior"
+ }
+ },
= "treefmt-nix": {
= "inputs": {
= "nixpkgs": [index 4eeb7cd..7410a54 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,10 @@
= systems.url = "github:nix-systems/default";
= devenv.url = "github:cachix/devenv";
= devenv.inputs.nixpkgs.follows = "nixpkgs";
+ tad-better-behavior = {
+ url = "git+http://codeberg.org/tad-lispy/tad-better-behavior";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
= };
=
= nixConfig = {
@@ -11,7 +15,7 @@
= extra-substituters = "https://devenv.cachix.org";
= };
=
- outputs = { self, nixpkgs, devenv, systems, ... } @ inputs:
+ outputs = { self, nixpkgs, devenv, systems, tad-better-behavior, ... } @ inputs:
= let
= forEachSystem = nixpkgs.lib.genAttrs (import systems);
= in
@@ -20,6 +24,7 @@
= (system:
= let
= pkgs = nixpkgs.legacyPackages.${system};
+ tbb = tad-better-behavior.packages.${system};
= in
= {
= default = devenv.lib.mkShell {
@@ -27,7 +32,10 @@
= modules = [
= {
= # https://devenv.sh/reference/options/
- packages = [ pkgs.miniserve ];
+ packages = with pkgs; [
+ miniserve
+ tbb.default
+ ];
= }
= ];
= };Write the first spec
Daniel spotted that the page has a vertical scroll. It's an easy fix - the footer has a horizontal padding that pushes width of the document beyond 100%. But I want to start using TBB here.
new file mode 100644
index 0000000..2452b63
--- /dev/null
+++ b/spec/layout.md
@@ -0,0 +1,10 @@
+# Basic Layout of the Page
+
+## The Width of the Body Doesn't Exceed the Viewport
+
+This scenario asserts that page content fits inside the viewport, i.e. there is no need for horizontal scrolling
+
+ * Serve the website on the port `1234`
+ * Navigate to `http://localhost:1234/`
+ * The title should be `Better Tech Club`
+ * The content is not wider than the viewportSetup a Babashka TBB interpreter
The tbb.clj and tbb_test.clj come from https://github.com/jewiet/form-to-mail/
index f03ce8a..dbf1cc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
=.devenv
=.direnv
+.clj-kondo/
+.lsp/index 7410a54..04e8d1d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,8 @@
= packages = with pkgs; [
= miniserve
= tbb.default
+ babashka
+ clojure-lsp
= ];
= }
= ];new file mode 100644
index 0000000..5837a2a
--- /dev/null
+++ b/spec/interpreters/bb.edn
@@ -0,0 +1 @@
+{:paths ["."]}new file mode 100644
index 0000000..b270417
--- /dev/null
+++ b/spec/interpreters/tbb.clj
@@ -0,0 +1,100 @@
+(ns tbb
+ (:require
+ [cheshire.core :as json]
+ [clojure.pprint :refer [pprint]]
+ [clojure.string :refer [blank?]]
+ [taoensso.timbre :as timbre]))
+
+(timbre/merge-config!
+ {:appenders
+ {:println (timbre/println-appender
+ {:stream *err*})}
+ :min-level (keyword (or
+ (System/getenv "tbb_interpreter_log")
+ "info"))})
+
+;; TODO: Make it work with Babashka (so no dependency on JDK)
+;; TODO: Distribute this with TBB so it can be used in other Clojure projects.
+
+(defonce ^:private steps-implementation (atom {}))
+
+(defn implement-step [variant f]
+ (swap! steps-implementation assoc variant f))
+
+;; See unit test for example uses
+(defmacro tis
+ "Similar to assert but the exception message will have arguments evaluated. See unit tests for more details"
+ [f & args]
+ `(when-not (~f ~@args)
+ (throw (AssertionError. (str "failed assertion: "
+ (cons '~f (list ~@args)))))))
+
+(defn ready []
+ (println (json/encode {:type "InterpreterState"
+ :ready true}))
+
+ (doseq [line (line-seq (java.io.BufferedReader. *in*))]
+ (when-not (blank? line)
+ (let [message (json/parse-string line true)
+ step (:step message)
+ variant (:variant step)
+ arguments (:arguments step)
+ implmentation (get @steps-implementation variant)]
+ (timbre/debug "got a message from tbb" message)
+ (if (nil? implmentation)
+ (let [suggestion
+ `(tbb/implement-step
+ ~variant
+ (~'fn [~@(map-indexed
+ (fn [indx _]
+ (symbol (str "arg-" indx)))
+ arguments)
+ ~'data]
+ (tis ~'= "cat" "dog")))]
+
+ (timbre/error "missing step implementation" variant)
+ (println (json/generate-string {:type "Failure"
+ :reason "Not implemented"
+ :hint (str "To get started put this in your interpreter:\n\n"
+ "``` clojure\n"
+ (with-out-str (pprint suggestion))
+ "```")})))
+ (try
+ (apply implmentation (conj arguments step))
+ (println (json/generate-string {:type "Success"}))
+ (catch Throwable e
+ (println (json/generate-string {:type "Failure"
+ :reason (.getMessage e)}))))))))
+
+ (timbre/debug "Done reading from tbb."))
+
+(defn send-text [text]
+ (println (json/generate-string {:type "Text"
+ :content (pr-str text)}))
+ text)
+
+(defn send-link
+ ([url]
+ (println (json/generate-string {:type "Link"
+ :url (str url)}))
+ url)
+
+ ([url label]
+ (println (json/generate-string {:type "Link"
+ :url (str url)
+ :label label}))
+ url))
+
+(defn table->maps [table]
+ ;; Each column in a table becomes a map in an array. Keys are derived from the first row.
+ (let [[header & rows] table
+ keywords (map keyword header)]
+ (map #(zipmap keywords %) rows)))
+
+(defn table->map
+ "Takes a sequence of maps with :name and :value pairings and returns a single map"
+ [maps key-kw value-kw]
+ (let [coll (table->maps maps)
+ ks (map #(keyword (key-kw %)) coll)
+ values (map value-kw coll)]
+ (zipmap ks values)))new file mode 100644
index 0000000..53753fb
--- /dev/null
+++ b/spec/interpreters/tbb_test.clj
@@ -0,0 +1,42 @@
+(ns tbb-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [tbb]
+ [clojure.string :as str]))
+
+(deftest tis-test
+ (testing "Simple expressions"
+ (is (nil?
+ (tbb/tis = 2 2))
+ "Returns nil if assertion is correct"))
+
+ (testing "Simple failing assertion"
+ (is (thrown-with-msg? AssertionError #"failed assertion: \(= 1 0\)"
+ (tbb/tis = 1 0))
+ "Throws an AssertionError with appropriate message"))
+
+ (testing "complex expression"
+ (is (nil?
+ (tbb/tis < 10 (* 3 (+ 2 2))))
+ "Still nil")
+
+ (is (thrown-with-msg? AssertionError #"failed assertion: \(< 20 12\)"
+ (tbb/tis < 20 (* 3 (+ 2 2))))
+ "In the exception message the arguments will be evaluated"))
+
+ (testing "inside a let expression"
+ (is (nil?
+ (let [heystack "Babashka"
+ needle "Baba"]
+ (tbb/tis str/starts-with? heystack needle)))
+ "Still works inside a let expression")
+
+ (is (thrown-with-msg? AssertionError #"failed assertion: \(str/starts-with\? \"Babashka\" \"Ruska\"\)"
+ (let [heystack "Babashka"
+ needle "Ruska"]
+ (tbb/tis str/starts-with? heystack needle)))
+ "Exception is thrown from the let expression too")))
+
+(let [{:keys [fail error]} (clojure.test/run-tests)]
+ (when (pos? (+ fail error))
+ (System/exit 1)))new file mode 100644
index 0000000..4dac78f
--- /dev/null
+++ b/spec/interpreters/web_automation.clj
@@ -0,0 +1,12 @@
+(ns web-automation
+ (:require [tbb]
+ [taoensso.timbre :as timbre]))
+
+(defn -main [& args]
+ (timbre/info "Interpreter start")
+ (tbb/ready)
+ (timbre/info "Interpreter done"))
+
+(when (= *file* (System/getProperty "babashka.file"))
+ (apply -main *command-line-args*))
+index 2452b63..3487584 100644
--- a/spec/layout.md
+++ b/spec/layout.md
@@ -1,3 +1,7 @@
+---
+interpreter: bb spec/interpreters/web_automation.clj
+---
+
=# Basic Layout of the Page
=
=## The Width of the Body Doesn't Exceed the ViewportSetup CLJ Style for code formatting
index 04e8d1d..861094e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,7 @@
= tbb.default
= babashka
= clojure-lsp
+ cljstyle
= ];
= }
= ];