Fixe merge conflit

This commit is contained in:
Peter Maquiran
2021-01-19 08:52:43 +01:00
185 changed files with 6115 additions and 379 deletions
+17
View File
@@ -0,0 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g transform="translate(-285 -696) translate(0 84) translate(0 592) translate(285 20)">
<rect width="7" height="12" x="9" y="4" stroke="#42B9FE" stroke-width="2" rx="3.5"/>
<rect width="3" height="2" x="13" y="7" fill="#42B9FE" rx="1"/>
<path fill="#42B9FE" d="M12 18H13V22H12z"/>
<rect width="7" height="1" x="9" y="22" fill="#42B9FE" rx=".5"/>
<path stroke="#42B9FE" stroke-linecap="round" stroke-linejoin="round" d="M18 11.5c0 3.728-1.358 6.5-5.5 6.5C8.358 18 7 15.228 7 11.5"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 886 B

+16
View File
@@ -0,0 +1,16 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<g fill="none" fill-rule="evenodd">
<g stroke="#42B9FE" stroke-width="2">
<g>
<g>
<g>
<g transform="translate(-20 -696) translate(0 84) translate(0 592) translate(20 10) translate(0 10)">
<rect width="17" height="14" x="4" y="7" rx="2"/>
<path stroke-linecap="round" stroke-linejoin="round" d="M9 6.684C9 4.228 10.071 3 12.214 3s3.215 1.228 3.215 3.684V13.387C15.476 14.462 15 15 14 15s-1.476-.538-1.429-1.613h0V9.535h0"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 768 B

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

+16
View File
@@ -0,0 +1,16 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g>
<g transform="translate(-56 -149) translate(0 84) translate(0 25) translate(0 35) translate(56 5)">
<circle cx="12.5" cy="12.5" r="12.5" fill="#42B9FE"/>
<path stroke="#FFF" stroke-linejoin="round" stroke-width="2" d="M12.615 6c1.475 0 2.67 1.195 2.67 2.67v.5c0 .825-.372 1.561-.958 2.05 1.7.742 2.904 2.562 2.904 4.689 0 2.788-9.231 2.788-9.231 0 0-2.127 1.202-3.946 2.904-4.69-.586-.488-.959-1.225-.959-2.048v-.5C9.945 7.194 11.141 6 12.615 6z"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 846 B

@@ -0,0 +1,16 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<g fill="none" fill-rule="evenodd">
<g>
<g>
<g>
<g>
<g transform="translate(-56 -149) translate(0 84) translate(0 25) translate(0 35) translate(56 5)">
<circle cx="12.5" cy="12.5" r="12.5" fill="#42B9FE"/>
<path stroke="#FFF" stroke-linejoin="round" stroke-width="2" d="M12.615 6c1.475 0 2.67 1.195 2.67 2.67v.5c0 .825-.372 1.561-.958 2.05 1.7.742 2.904 2.562 2.904 4.689 0 2.788-9.231 2.788-9.231 0 0-2.127 1.202-3.946 2.904-4.69-.586-.488-.959-1.225-.959-2.048v-.5C9.945 7.194 11.141 6 12.615 6z"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 846 B

+18
View File
@@ -0,0 +1,18 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<defs>
<filter id="rz3uj5dqfa">
<feColorMatrix in="SourceGraphic" values="0 0 0 0 0.476308 0 0 0 0 0.476308 0 0 0 0 0.476308 0 0 0 1.000000 0"/>
</filter>
</defs>
<g fill="none" fill-rule="evenodd">
<g>
<g filter="url(#rz3uj5dqfa)" transform="translate(-30 -289) translate(20 279)">
<g stroke="#42B9FE" stroke-width="2" transform="translate(10 10)">
<rect width="15" height="15" x="5" y="5" rx="7.5"/>
<rect width="3" height="1" x="12" y="13" rx=".5"/>
<rect width="4" height="1" x="10.5" y="11.5" rx=".5" transform="rotate(-90 12.5 11)"/>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 827 B

+15
View File
@@ -0,0 +1,15 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<g fill="none" fill-rule="evenodd">
<g fill="#42B9FE">
<g>
<g>
<g transform="translate(-355 -114) translate(0 84) translate(0 25) translate(355 5)">
<circle cx="12.5" cy="12.5" r="2.5"/>
<circle cx="12.5" cy="5.5" r="2.5"/>
<circle cx="12.5" cy="19.5" r="2.5"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 570 B

+5 -1
View File
@@ -3,7 +3,11 @@
<g stroke="#797979" stroke-width="2">
<g>
<g>
<path d="M20 8.136l12 6.461V30c0 .552-.224 1.052-.586 1.414-.362.362-.862.586-1.414.586h0-5v-5c0-.788-.304-1.505-.8-2.04-.51-.549-1.222-.906-2.017-.954h0L18 24c-.788 0-1.505.304-2.04.8-.549.51-.906 1.222-.954 2.017h0L15 32H10c-.552 0-1.052-.224-1.414-.586C8.224 31.052 8 30.552 8 30h0V14.597l12-6.461z" transform="translate(-16 -740) translate(0 740) translate(16)"/>
<g transform="translate(-262 -740) translate(0 740) translate(246) translate(16)">
<path d="M20.5 34.5c5.523 0 10.5-.977 10.5-6.5s-4.477-10-10-10-10 4.477-10 10 3.977 6.5 9.5 6.5z"/>
<circle cx="21" cy="12" r="6"/>
<path stroke-linejoin="round" d="M23.423 19.064v16m-4.773 2.561l.354-19" transform="rotate(45 21.125 28.125)"/>
</g>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 661 B

After

Width:  |  Height:  |  Size: 717 B