Skip to content
Snippets Groups Projects
Commit 3567bce6 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch 'upstream' into 'master' 

Upstream

See merge request benoit.harrault/ameixa!1
parents 9e1fee49 f765727f
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
icons/peertube.svg 0 → 100644
+ 87
− 0
View file @ 3567bce6
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 28.747 28.747" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<filter id="filter6206-7" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation="0.658125"/>
</filter>
</defs>
<g transform="translate(0 -1093.8)">
<path transform="matrix(1.0781 0 0 1.0641 -.093733 2.7509)" d="m4.4177 1028.2v1.6051h-1.6052v18.192h1.6052v2.1402h18.192v-2.1402h2.1402v-18.192h-2.1402v-1.6051z" fill="#3e2723" filter="url(#filter6206-7)" opacity=".2"/>
<rect x="2.9987" y="1096.8" width="22.749" height="22.749" rx="1.1973" ry="1.1974" fill="#ff5722"/>
<g transform="translate(-22.32 1056.5)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
<g transform="matrix(.33601 0 0 .33601 1.5296 73.043)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
<g transform="matrix(.37187 0 0 .37187 38.802 63.239)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
<g transform="matrix(2.6891 0 0 2.6891 -82.906 -48.45)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
</g>
</g>
<path d="m4.1958 1096.8c-0.66332 0-1.1979 0.5346-1.1979 1.1979v0.3334c0-0.6634 0.53459-1.1979 1.1979-1.1979h20.354c0.66332 0 1.1979 0.5345 1.1979 1.1979v-0.3334c0-0.6633-0.5346-1.1979-1.1979-1.1979z" fill="#fff" opacity=".2"/>
<rect x="128" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="160" y="578.52" width="192" height="192" fill="none" stroke-width="1.0667"/>
<g transform="matrix(.37344 0 0 .37344 4.7333 1097.4)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
<g transform="matrix(.36471 0 0 .36471 5.1356 1097.4)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
<g transform="matrix(.41585 0 0 .41585 84.325 1055.9)">
<g transform="matrix(.062269 0 0 .062269 -28.238 185.29)">
<g transform="matrix(38.618 0 0 38.618 14724 -13542)">
<g transform="matrix(.71436 0 0 .71436 -400.52 188.34)">
<path d="m1293.2-120.67c-181.75 0.2763-511.18 0.13525-699.05 0.13998-2.3216 10.413-3.593 21.251-3.593 32.384v114c207.65 0.73695 494.72 0.38136 706.23 0.3733v-114.37c0-11.18-1.2522-22.07-3.593-32.523zm-458.69 295.56c-78.385-4e-3 -158.85 0.17892-243.95 0.55995v138.63c286.34-0.39317 421.73-0.13827 706.23-0.32664v-137.75c-163.2-0.53005-311.22-1.1113-462.28-1.1199z" opacity="0" stroke-width="1.4932"/>
</g>
</g>
</g>
</g>
<path d="m24.549 1119.5c0.66325 0 1.1979-0.5346 1.1979-1.1979v-0.3333c0 0.6632-0.53461 1.1978-1.1979 1.1978h-20.354c-0.66325 0-1.1979-0.5346-1.1979-1.1978v0.3333c0 0.6633 0.53461 1.1979 1.1979 1.1979z" fill="#3e2723" opacity=".2"/>
</g>
<g>
<flowRoot fill="#000000" font-family="Roboto" font-size="12.8px" letter-spacing="0px" stroke-width="1.0667px" word-spacing="0px" style="line-height:0.01%" xml:space="preserve"><flowRegion><rect x="11.375" y="11.984" width="4.7893" height="5.388" stroke-width="1.1378px"/></flowRegion><flowPara font-size="4px" style="line-height:1.25">your</flowPara></flowRoot>
<path d="m9.5784 7.788v6.5918l2.8511-1.6458 2.8511-1.6479v6.581l5.7044-3.2937-5.7044-3.2916zm5.7023 9.8791-0.0043 0.0022 0.0043 0.0022zm-0.0043 0.0022-2.8468-1.6437-2.8511-1.6458v6.5789z" fill="#fff"/>
</g>
<g display="none" fill="none">
<rect transform="rotate(90)" x="7.8232" y="-20.923" width="13.1" height="13.1" display="inline" stroke="#000" stroke-width=".070382"/>
<rect x="7.2241" y="8.6528" width="14.298" height="11.441" stroke="#5261ff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".069589"/>
<rect transform="rotate(90)" x="7.2241" y="-20.094" width="14.298" height="11.441" display="inline" stroke="#0f0" stroke-linecap="round" stroke-linejoin="round" stroke-width=".069589"/>
</g>
</svg>
todo/wip/metronome.svg deleted 100644 → 0
+ 0
− 2372
View file @ 9e1fee49
This diff is collapsed.
todo/wip/towerjumper.svg
+ 85
− 0
View file @ 3567bce6
......@@ -1844,6 +1844,7 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
<<<<<<< HEAD
inkscape:zoom="16.000001"
inkscape:cx="7.9229485"
inkscape:cy="17.496728"
......@@ -1857,6 +1858,22 @@
inkscape:window-maximized="1"
units="px"
showguides="false">
=======
inkscape:zoom="8"
inkscape:cx="9.3704372"
inkscape:cy="-1.0068835"
inkscape:document-units="pt"
inkscape:current-layer="layer3"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
units="px"
showguides="true"
inkscape:guide-bbox="true">
>>>>>>> 2308441e... add towerjumper icon
<inkscape:grid
type="xygrid"
id="grid2985"
......@@ -1918,9 +1935,15 @@
inkscape:connector-curvature="0"
id="rect6141-3"
d="m 4.417683,1028.1747 v 1.6051 H 2.8125 v 18.1922 h 1.605183 v 2.1402 h 18.192073 v -2.1402 H 24.75 v -18.1922 h -2.140244 v -1.6051 z"
<<<<<<< HEAD
style="display:inline;opacity:0.2;fill:#3e2723;fill-opacity:1;stroke:none;filter:url(#filter6206-7)" />
<rect
style="display:inline;opacity:1;fill:#e91e63;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.06666667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
=======
style="display:inline;opacity:0.2;fill:#263238;fill-opacity:1;stroke:none;filter:url(#filter6206-7)" />
<rect
style="display:inline;opacity:1;fill:#03a9f4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.06666667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
>>>>>>> 2308441e... add towerjumper icon
id="rect4731-1"
width="22.749332"
height="22.749332"
......@@ -2280,7 +2303,11 @@
</g>
<path
inkscape:connector-curvature="0"
<<<<<<< HEAD
style="display:inline;opacity:0.2;fill:#3e2723;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.06666667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
=======
style="display:inline;opacity:0.2;fill:#263238;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.06666667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
>>>>>>> 2308441e... add towerjumper icon
d="m 24.549441,1119.5437 c 0.663252,0 1.197867,-0.5346 1.197867,-1.1979 v -0.3333 c 0,0.6632 -0.534614,1.1978 -1.197867,1.1978 H 4.1952005 c -0.6632533,0 -1.1978672,-0.5346 -1.1978672,-1.1978 v 0.3333 c 0,0.6633 0.5346139,1.1979 1.1978672,1.1979 z"
id="rect4731-2" />
</g>
......@@ -2303,9 +2330,67 @@
style="stroke-width:1.13777781px" /></flowRegion><flowPara
id="flowPara4704"
style="font-size:4px;line-height:1.25;stroke-width:1.06666672px">your</flowPara></flowRoot> <path
<<<<<<< HEAD
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.1542778;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 14.373047 7.234375 A 7.1395836 7.1395836 0 0 0 12.636719 7.4589844 L 13.685547 11.654297 A 2.8085549 2.8085549 0 0 1 14.373047 11.564453 A 2.8085549 2.8085549 0 0 1 15.050781 11.650391 L 16.101562 7.453125 A 7.1395836 7.1395836 0 0 0 14.373047 7.234375 z M 19.5 9.4140625 L 16.392578 12.419922 A 2.8085549 2.8085549 0 0 1 17.074219 13.605469 L 21.230469 12.417969 A 7.1395836 7.1395836 0 0 0 19.5 9.4140625 z M 9.2382812 9.4179688 A 7.1395836 7.1395836 0 0 0 7.5097656 12.419922 L 11.671875 13.609375 A 2.8085549 2.8085549 0 0 1 12.349609 12.427734 L 9.2382812 9.4179688 z M 11.673828 15.148438 L 7.515625 16.335938 A 7.1395836 7.1395836 0 0 0 9.2480469 19.332031 L 12.353516 16.326172 A 2.8085549 2.8085549 0 0 1 11.673828 15.148438 z M 17.070312 15.150391 A 2.8085549 2.8085549 0 0 1 16.384766 16.330078 L 19.498047 19.341797 A 7.1395836 7.1395836 0 0 0 21.234375 16.339844 L 17.070312 15.150391 z M 13.6875 17.09375 L 12.638672 21.289062 A 7.1395836 7.1395836 0 0 0 14.373047 21.513672 A 7.1395836 7.1395836 0 0 0 16.097656 21.292969 L 15.046875 17.095703 A 2.8085549 2.8085549 0 0 1 14.373047 17.181641 A 2.8085549 2.8085549 0 0 1 13.6875 17.09375 z "
id="path1246" />
=======
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.37596625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 13.232422 11.867188 A 0.95222008 0.95222008 0 0 0 12.28125 12.820312 A 0.95222008 0.95222008 0 0 0 12.369141 13.216797 A 5.5746989 2.7873495 0 0 1 14.166016 13.003906 A 0.95222008 0.95222008 0 0 0 14.185547 12.820312 A 0.95222008 0.95222008 0 0 0 13.232422 11.867188 z M 14.166016 13.003906 A 0.95222008 0.95222008 0 0 1 13.232422 13.771484 A 0.95222008 0.95222008 0 0 1 12.369141 13.216797 A 5.5746989 2.7873495 0 0 0 10.179688 14.054688 A 5.5746989 2.7873495 0 0 0 10.486328 17.6875 A 5.5746989 2.7873495 0 0 0 17.712891 18.078125 L 14.554688 15.78125 L 19.755859 16.785156 A 5.5746989 2.7873495 0 0 0 17.316406 13.361328 A 5.5746989 2.7873495 0 0 0 14.166016 13.003906 z "
id="path1265" />
<ellipse
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12060439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path1273"
ry="0.89414018"
rx="1.7882804"
cy="15.64584"
cx="14.367052" />
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.32300001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1296"
width="0.59866667"
height="1.796"
x="7.1315546"
y="13.266614"
ry="0.29933333"
transform="rotate(-20)" />
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.32300001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1298"
width="0.59866667"
height="1.1973333"
x="8.3412743"
y="13.768261"
ry="0.29933333"
transform="rotate(-20)" />
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.32300001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1300"
width="0.59866667"
height="1.1973333"
x="7.5500484"
y="9.9456625"
ry="0.29933333"
transform="rotate(-20)" />
<rect
transform="rotate(-20)"
ry="0.29933333"
y="11.556698"
x="7.1334305"
height="1.1973333"
width="0.59866667"
id="rect1306"
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.32300001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
transform="rotate(-20)"
ry="0.29933333"
y="11.301596"
x="8.1907787"
height="1.796"
width="0.59866667"
id="rect1308"
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.32300001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
>>>>>>> 2308441e... add towerjumper icon
</g>
<g
inkscape:groupmode="layer"
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment