fix: resolve merge conflicts
This commit is contained in:
Dashboard Icons Bot
committed by
Bjorn Lammers
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,102 +1 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.7.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:url(#f_00000004531687335382538340000005715013793030899351_);}
|
||||
.st1{opacity:0.32;fill:url(#h_00000121994529725305041610000004785894074425367467_);enable-background:new ;}
|
||||
.st2{opacity:0.44;fill:url(#j_00000086656049368606176340000014357773645815101882_);enable-background:new ;}
|
||||
.st3{opacity:0.35;fill:#0F0F0D;enable-background:new ;}
|
||||
.st4{fill:url(#o_00000179646757126130200520000007601943648106549379_);}
|
||||
.st5{opacity:0.7;fill:url(#q_00000016761713181764493080000015797806689375016604_);enable-background:new ;}
|
||||
.st6{opacity:0.3;fill:url(#s_00000054974463176456833220000002013857319600440223_);enable-background:new ;}
|
||||
.st7{opacity:0.2;fill:#0F0F0D;enable-background:new ;}
|
||||
.st8{fill:url(#v_00000051368890831520322160000003372598497180575113_);}
|
||||
</style>
|
||||
<g>
|
||||
<g id="b">
|
||||
<g id="c">
|
||||
<g id="d">
|
||||
|
||||
<linearGradient id="f_00000065075906155061487890000000410856691874330292_" gradientUnits="userSpaceOnUse" x1="256" y1="540.962" x2="256" y2="28.962" gradientTransform="matrix(1 0 0 -1 0 514)">
|
||||
<stop offset="0" style="stop-color:#414141"/>
|
||||
<stop offset="0.196" style="stop-color:#3E3E3E"/>
|
||||
<stop offset="1" style="stop-color:#3A3A3A"/>
|
||||
</linearGradient>
|
||||
<path id="f" style="fill:url(#f_00000065075906155061487890000000410856691874330292_);" d="M256,512C114.8,512,0,397.2,0,256
|
||||
S114.8,0,256,0s256,114.8,256,256S397.2,512,256,512z M256,21.5C126.8,21.5,21.6,126.7,21.6,256S126.8,490.5,256,490.5
|
||||
S490.4,385.3,490.4,256S385.2,21.5,256,21.5z"/>
|
||||
|
||||
<radialGradient id="h_00000073690642176329171980000013976197198741709957_" cx="900.0481" cy="196.1859" r="871.131" gradientTransform="matrix(0.3539 0 0 -0.3539 -78.6579 277.6242)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0.6733" style="stop-color:#FCFCFC;stop-opacity:0"/>
|
||||
<stop offset="1" style="stop-color:#FCFCFC"/>
|
||||
</radialGradient>
|
||||
|
||||
<path id="h" style="opacity:0.32;fill:url(#h_00000073690642176329171980000013976197198741709957_);enable-background:new ;" d="
|
||||
M256,0.1C114.9,0.1,0.1,114.9,0.1,256S114.9,511.9,256,511.9S511.9,397.1,511.9,256S397.1,0.1,256,0.1z"/>
|
||||
|
||||
<radialGradient id="j_00000066476116228017641990000000284666322395441551_" cx="935.1306" cy="81.4374" r="724.6578" gradientTransform="matrix(0.3539 0 0 -0.3539 -78.6579 277.6242)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0.1088" style="stop-color:#0F0F0D;stop-opacity:0"/>
|
||||
<stop offset="0.8856" style="stop-color:#414141;stop-opacity:0"/>
|
||||
<stop offset="0.9339" style="stop-color:#1E1E1D;stop-opacity:0.6841"/>
|
||||
<stop offset="0.9874" style="stop-color:#0F0F0D"/>
|
||||
</radialGradient>
|
||||
|
||||
<path id="j" style="opacity:0.44;fill:url(#j_00000066476116228017641990000000284666322395441551_);enable-background:new ;" d="
|
||||
M256,512C114.8,512,0,397.2,0,256S114.8,0,256,0s256,114.8,256,256S397.2,512,256,512z M256,21.5
|
||||
C126.8,21.5,21.6,126.7,21.6,256S126.8,490.5,256,490.5S490.4,385.3,490.4,256S385.2,21.5,256,21.5z"/>
|
||||
<path id="k" d="M256,22.9c-130.2,0-236.2,105.9-236.2,236.2S125.8,495.2,256,495.2s236.2-105.9,236.2-236.2S386.2,22.9,256,22.9
|
||||
z"/>
|
||||
<path id="l" class="st3" d="M256,512C114.8,512,0,397.2,0,256S114.8,0,256,0s256,114.8,256,256S397.2,512,256,512z M256,5.5
|
||||
C114.8,5.5,0,118.8,0,258.1s114.8,252.6,256,252.6s256-113.3,256-252.6S397.2,5.5,256,5.5L256,5.5z"/>
|
||||
</g>
|
||||
<g id="m">
|
||||
|
||||
<radialGradient id="o_00000016053566828958532060000015891124444995540100_" cx="959.2825" cy="64.8804" r="1407.5225" gradientTransform="matrix(0.3539 0 0 -0.2026 -78.6579 111.2234)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#2E6B26"/>
|
||||
<stop offset="1" style="stop-color:#6AB536"/>
|
||||
</radialGradient>
|
||||
<path id="o" style="fill:url(#o_00000016053566828958532060000015891124444995540100_);" d="M256,21.5
|
||||
C126.7,21.5,21.5,126.7,21.5,256S126.7,490.5,256,490.5S490.5,385.3,490.5,256S385.3,21.5,256,21.5z"/>
|
||||
|
||||
<radialGradient id="q_00000113343783121926166570000016293337676827231119_" cx="948.7516" cy="523.3653" r="274.8847" gradientTransform="matrix(0.3539 0 0 -0.3539 -78.6579 277.6242)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#6AB536"/>
|
||||
<stop offset="1" style="stop-color:#2E6B26"/>
|
||||
</radialGradient>
|
||||
|
||||
<path id="q" style="opacity:0.7;fill:url(#q_00000113343783121926166570000016293337676827231119_);enable-background:new ;" d="
|
||||
M256,41c-38.5,0-69.8,31.3-69.8,69.8s31.3,69.8,69.8,69.8c38.5,0,69.8-31.3,69.8-69.8S294.5,41,256,41z"/>
|
||||
|
||||
<radialGradient id="s_00000150803380918627216840000006613569630607994240_" cx="990.518" cy="592.2305" r="406.0063" gradientTransform="matrix(0.3356 0 0 -0.5572 -76.7755 481.4267)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#000000"/>
|
||||
<stop offset="0.7842" style="stop-color:#4F4F4F;stop-opacity:0"/>
|
||||
</radialGradient>
|
||||
|
||||
<path id="s" style="opacity:0.3;fill:url(#s_00000150803380918627216840000006613569630607994240_);enable-background:new ;" d="
|
||||
M132.8,55.8c0,0.1,0,0.2,0,0.2C132.4,56.1,132.4,56,132.8,55.8z M309.8,206.2l-3.2,57.9l38.3,41.7l-38.3,41.7l25.3,27.6
|
||||
l-25.3,27.6l3.2,57.5H202.2V206.2c-42.8-21.9-72-69.2-72-123.6c0-9.1,1.3-17.5,2.6-26.6c4.6-0.9,79.7-32.3,79.7-32.3
|
||||
c-0.6,3.4,87.7,3.4,87,0c0,0,72.5,31.2,79.8,32.7c1.8,8.9,2.5,17.2,2.5,26.2C381.8,137,352,184.3,309.8,206.2L309.8,206.2z
|
||||
M379.2,55.8c0,0.2,0.1,0.4,0.1,0.6C380.1,56.6,380.2,56.4,379.2,55.8z"/>
|
||||
<path id="t" class="st7" d="M130.4,409.1C88.8,373,62.4,319.6,62.4,259.9c0-69.5,36.3-133.6,96.1-169.4
|
||||
c-1.1,6.9-2.1,13.4-2.1,20.3c0,41.1,24,76.9,59.3,93.5v187.5l44.3,44.3l44.3-44.3l-2.7-39l20.8-20.8l-20.8-20.8l31.5-31.5
|
||||
l-31.5-31.5l2.7-43.8c34.7-16.6,59.3-52.4,59.3-93.5c0-6.9-0.5-13.4-2.1-20.3c21.7,13.1,40.3,30,55.2,49.6
|
||||
c-36.1-49.6-94.7-81.8-160.9-81.8C146.2,58.4,57.3,146.8,57.3,256C57.3,317.8,85.8,372.9,130.4,409.1L130.4,409.1z M245.6,376.9
|
||||
h-15v-148h15V376.9z M224.3,66c11.8-2.1,24-3.2,35.8-3.2c12.3-0.5,24,1.1,35.8,3.2c0.5,2.7,1.1,5.3,1.1,8
|
||||
c0,20.3-16.6,36.9-36.9,36.9S223.2,94.3,223.2,74C223.2,71.3,223.7,68.7,224.3,66L224.3,66z"/>
|
||||
|
||||
<radialGradient id="v_00000052096042692925626350000017960013326704572052_" cx="942.8964" cy="605.9864" r="939.5499" gradientTransform="matrix(0.3539 0 0 -0.3539 -78.6579 277.6242)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#F5F5F5"/>
|
||||
<stop offset="0.5481" style="stop-color:#F2F2F2"/>
|
||||
</radialGradient>
|
||||
<path id="v" style="fill:url(#v_00000052096042692925626350000017960013326704572052_);" d="M256,21.5
|
||||
C126.8,21.5,21.6,126.7,21.6,256S126.8,490.5,256,490.5S490.4,385.3,490.4,256S385.2,21.5,256,21.5z M220.2,61.8
|
||||
c11.8-2.1,24-3.2,35.8-3.2c12.3-0.5,24,1.1,35.8,3.2c0.5,2.7,1.1,5.3,1.1,8c0,20.3-16.6,36.9-36.9,36.9s-36.9-16.6-36.9-36.9
|
||||
C219.1,67.2,219.7,64.5,220.2,61.8L220.2,61.8z M241.6,224.8v148h-15v-148H241.6z M256,453.5c-109,0-197.6-88.2-197.6-197.7
|
||||
c0-69.5,36.3-133.6,96.1-169.4c-1.1,6.9-2.1,13.4-2.1,20.3c0,41.1,24,76.9,59.3,93.5v187.5l44.3,44.3l44.3-44.3l-2.7-39
|
||||
l20.8-20.8l-20.8-20.8l31.5-31.5L297.7,244l2.7-43.8c34.7-16.6,59.3-52.4,59.3-93.5c0-6.9-0.5-13.4-2.1-20.3
|
||||
c59.3,35.8,95.6,99.9,96.1,169.4C453.6,364.8,365.5,453.5,256,453.5z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><linearGradient id="a" x1="256" x2="256" y1="540.962" y2="28.962" gradientTransform="matrix(1 0 0 -1 0 514)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#414141"/><stop offset=".196" style="stop-color:#3e3e3e"/><stop offset="1" style="stop-color:#3a3a3a"/></linearGradient><path d="M256 512C114.8 512 0 397.2 0 256S114.8 0 256 0s256 114.8 256 256-114.8 256-256 256m0-490.5C126.8 21.5 21.6 126.7 21.6 256S126.8 490.5 256 490.5 490.4 385.3 490.4 256 385.2 21.5 256 21.5" style="fill:url(#a)"/><radialGradient id="b" cx="900.048" cy="196.186" r="871.131" gradientTransform="matrix(.3539 0 0 -.3539 -78.658 277.624)" gradientUnits="userSpaceOnUse"><stop offset=".673" style="stop-color:#fcfcfc;stop-opacity:0"/><stop offset="1" style="stop-color:#fcfcfc"/></radialGradient><path d="M256 .1C114.9.1.1 114.9.1 256S114.9 511.9 256 511.9 511.9 397.1 511.9 256 397.1.1 256 .1" style="opacity:.32;fill:url(#b)"/><radialGradient id="c" cx="935.131" cy="81.437" r="724.658" gradientTransform="matrix(.3539 0 0 -.3539 -78.658 277.624)" gradientUnits="userSpaceOnUse"><stop offset=".109" style="stop-color:#0f0f0d;stop-opacity:0"/><stop offset=".886" style="stop-color:#414141;stop-opacity:0"/><stop offset=".934" style="stop-color:#1e1e1d;stop-opacity:.6841"/><stop offset=".987" style="stop-color:#0f0f0d"/></radialGradient><path d="M256 512C114.8 512 0 397.2 0 256S114.8 0 256 0s256 114.8 256 256-114.8 256-256 256m0-490.5C126.8 21.5 21.6 126.7 21.6 256S126.8 490.5 256 490.5 490.4 385.3 490.4 256 385.2 21.5 256 21.5" style="opacity:.44;fill:url(#c)"/><path d="M256 22.9c-130.2 0-236.2 105.9-236.2 236.2s106 236.1 236.2 236.1S492.2 389.3 492.2 259 386.2 22.9 256 22.9"/><path d="M256 512C114.8 512 0 397.2 0 256S114.8 0 256 0s256 114.8 256 256-114.8 256-256 256m0-506.5C114.8 5.5 0 118.8 0 258.1s114.8 252.6 256 252.6 256-113.3 256-252.6S397.2 5.5 256 5.5" style="opacity:.35;fill:#0f0f0d"/><radialGradient id="d" cx="959.283" cy="64.88" r="1407.523" gradientTransform="matrix(.3539 0 0 -.2026 -78.658 111.223)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#2e6b26"/><stop offset="1" style="stop-color:#6ab536"/></radialGradient><path d="M256 21.5C126.7 21.5 21.5 126.7 21.5 256S126.7 490.5 256 490.5 490.5 385.3 490.5 256 385.3 21.5 256 21.5" style="fill:url(#d)"/><radialGradient id="e" cx="948.752" cy="523.365" r="274.885" gradientTransform="matrix(.3539 0 0 -.3539 -78.658 277.624)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#6ab536"/><stop offset="1" style="stop-color:#2e6b26"/></radialGradient><path d="M256 41c-38.5 0-69.8 31.3-69.8 69.8s31.3 69.8 69.8 69.8 69.8-31.3 69.8-69.8S294.5 41 256 41" style="opacity:.7;fill:url(#e)"/><radialGradient id="f" cx="990.518" cy="592.231" r="406.006" gradientTransform="matrix(.3356 0 0 -.5572 -76.775 481.427)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#000"/><stop offset=".784" style="stop-color:#4f4f4f;stop-opacity:0"/></radialGradient><path d="M132.8 55.8v.2c-.4.1-.4 0 0-.2m177 150.4-3.2 57.9 38.3 41.7-38.3 41.7 25.3 27.6-25.3 27.6 3.2 57.5H202.2v-254c-42.8-21.9-72-69.2-72-123.6 0-9.1 1.3-17.5 2.6-26.6 4.6-.9 79.7-32.3 79.7-32.3-.6 3.4 87.7 3.4 87 0 0 0 72.5 31.2 79.8 32.7 1.8 8.9 2.5 17.2 2.5 26.2 0 54.4-29.8 101.7-72 123.6m69.4-150.4c0 .2.1.4.1.6.8.2.9 0-.1-.6" style="opacity:.3;fill:url(#f)"/><path d="M130.4 409.1c-41.6-36.1-68-89.5-68-149.2 0-69.5 36.3-133.6 96.1-169.4-1.1 6.9-2.1 13.4-2.1 20.3 0 41.1 24 76.9 59.3 93.5v187.5l44.3 44.3 44.3-44.3-2.7-39 20.8-20.8-20.8-20.8 31.5-31.5-31.5-31.5 2.7-43.8c34.7-16.6 59.3-52.4 59.3-93.5 0-6.9-.5-13.4-2.1-20.3 21.7 13.1 40.3 30 55.2 49.6-36.1-49.6-94.7-81.8-160.9-81.8-109.6 0-198.5 88.4-198.5 197.6 0 61.8 28.5 116.9 73.1 153.1m115.2-32.2h-15v-148h15zM224.3 66c11.8-2.1 24-3.2 35.8-3.2 12.3-.5 24 1.1 35.8 3.2.5 2.7 1.1 5.3 1.1 8 0 20.3-16.6 36.9-36.9 36.9S223.2 94.3 223.2 74c0-2.7.5-5.3 1.1-8" style="opacity:.2;fill:#0f0f0d"/><radialGradient id="g" cx="942.896" cy="605.986" r="939.55" gradientTransform="matrix(.3539 0 0 -.3539 -78.658 277.624)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#f5f5f5"/><stop offset=".548" style="stop-color:#f2f2f2"/></radialGradient><path d="M256 21.5C126.8 21.5 21.6 126.7 21.6 256S126.8 490.5 256 490.5 490.4 385.3 490.4 256 385.2 21.5 256 21.5m-35.8 40.3c11.8-2.1 24-3.2 35.8-3.2 12.3-.5 24 1.1 35.8 3.2.5 2.7 1.1 5.3 1.1 8 0 20.3-16.6 36.9-36.9 36.9s-36.9-16.6-36.9-36.9c0-2.6.6-5.3 1.1-8m21.4 163v148h-15v-148zM256 453.5c-109 0-197.6-88.2-197.6-197.7 0-69.5 36.3-133.6 96.1-169.4-1.1 6.9-2.1 13.4-2.1 20.3 0 41.1 24 76.9 59.3 93.5v187.5L256 432l44.3-44.3-2.7-39 20.8-20.8-20.8-20.8 31.5-31.5-31.4-31.6 2.7-43.8c34.7-16.6 59.3-52.4 59.3-93.5 0-6.9-.5-13.4-2.1-20.3 59.3 35.8 95.6 99.9 96.1 169.4-.1 109-88.2 197.7-197.7 197.7" style="fill:url(#g)"/></svg>
|
||||
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 4.8 KiB |
Reference in New Issue
Block a user