Solved conflicts.

This commit is contained in:
arturoacevedob
2017-11-28 17:16:35 -06:00
parent 3abdbe3b47
commit 0141106fea
9 changed files with 11 additions and 8 deletions

View File

@@ -209,4 +209,4 @@ From [SVGporn](https://github.com/gilbarbara/logos/) - CC0
IBM, Yammer, Android, Authy, ClourFlare, CodePen, DigitalOcean, Discord, AirBnB, WiFi, delicious, opensource, Patreon
Where possible, they retain their original licenses. Some logos may be subject to copyright and trademark laws, but these files are small enough to memorise.
Where possible, they retain their original licenses. Some logos may be subject to copyright and trademark laws, but these files are small enough to memorise.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Apple" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#666" rx="15%"/><path d="M400 352c-11 26-28 49-47 68-9 10-22 15-35 16-7 0-18-3-31-8-21-9-46-9-67 0-13 5-22 8-31 8-11 1-22-5-34-16-43-41-68-99-69-159 0-26 5-48 17-66 18-29 48-47 81-48 9 0 22 3 37 8 14 6 23 9 28 9 4 0 14-4 31-10s33-9 43-8c33 3 56 15 73 38a80 80 0 0 0-42 73c-1 33 19 64 52 77zM326 64c0 19-7 36-20 53-18 19-38 31-60 29v-8c3-43 36-78 79-82z" fill="#fff"/></svg>
<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Apple" role="img"><rect height="512" rx="15%" width="512"/><path d="m419 349c-12 28-29 52-50 73a54 54 0 0 1 -36 16c-9 0-20-3-33-8a91 91 0 0 0 -72 0c-13 5-23 8-32 8-12 1-24-5-36-16-46-44-72-105-73-169 0-27 5-51 18-70 18-31 50-50 86-51 9 0 22 3 38 9s25 9 30 9c4 0 15-4 33-10 18-7 34-10 46-9 34 3 59 16 77 41a85 85 0 0 0 -45 76 85 85 0 0 0 55 82zm-78-305c0 20-7 39-22 56-18 21-40 33-63 31v-8a93 93 0 0 1 84-87z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 502 B

View File

@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Google" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#f8f8f8" rx="15%"/><path fill="none" stroke="#4285f4" stroke-width="60" d="M276 252h149a170 170 0 1 1-80-140"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Google" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#fff" rx="15%"/><g fill="none" fill-rule="evenodd"><path fill="#4285f4" d="M482.6 261.4c0-16.8-1.5-33-4.3-48.3H256v91.6h127c-5.5 29.5-22 54.5-47 71.2V435h76c44.6-41 70.4-101.7 70.4-173.5z"/><path fill="#34a853" d="M256 492c63.7 0 117-21 156.2-57.2L336 375.6c-21.2 14.2-48.2 22.5-80 22.5-61.5 0-113.5-41.2-132-97H45v61c39 77 118.7 130 211 130z"/><path fill="#fbbc05" d="M124 300.8c-4.8-14-7.4-29.3-7.4-44.8s2.6-30.7 7.4-44.8V150H45c-16 32-25 68-25 106s9 74 25 106l79-61.2z"/><path fill="#ea4335" d="M256 114c34.6 0 65.8 11.8 90.2 35L414 81.7C373 43.5 319.5 20 256 20 163.7 20 84 73 45 150l79 61.2c18.5-55.8 70.5-97.3 132-97.3z"/><path d="M20 20h472v472H20V20z"/></g></svg>

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 802 B

View File

@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Kickstarter" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#fff" rx="15%"/><defs><clipPath id="a"><path d="M1226.4 862.8l154 153a405.2 405.2 0 0 1 0 575 411.8 411.8 0 0 1-578.9 0l-56-55.7A409 409 0 0 1 409 1710c-225.8 0-409-182-409-406.3v-881C0 198.5 183.2 16.6 409 16.6a409 409 0 0 1 336.5 174.9l56-55.7a411.8 411.8 0 0 1 578.9 0 405.2 405.2 0 0 1 0 575z"/></clipPath><clipPath id="b"><path d="M0 0h1500v1710H0z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(.25981 0 0 -.25981 61 480.3)"><g clip-path="url(#b)"><path fill="#034752" d="M0 0h1650v1860H0z"/></g></g></svg>
<svg viewBox="0 0 512 512" aria-label="Kickstarter" role="img" xmlns="http://www.w3.org/2000/svg"><rect fill="#fff" height="512" rx="15%" width="512"/><path d="m170 142v225l60-110 115-115-115 115 115 110" fill="none" stroke="#034752" stroke-linecap="round" stroke-linejoin="round" stroke-width="210"/></svg>

Before

Width:  |  Height:  |  Size: 661 B

After

Width:  |  Height:  |  Size: 308 B

View File

@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Tumblr" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#39475d" rx="220"/><path fill="#fff" d="M373 431c-14 15-45 25-73 25h-3c-95 0-115-69-115-110V234h-37a8 8 0 0 1-8-8v-53a13 13 0 0 1 9-13c48-17 63-59 66-91 0-9 5-13 12-13h56a8 8 0 0 1 7 8v90h65a8 8 0 0 1 8 8v63a8 8 0 0 1-8 8h-65v104c0 26 17 34 28 34 10-1 20-4 25-6l10-2c3 1 5 3 6 7l17 50c2 4 3 8 0 11z" class="cls-1"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Tumblr" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#39475d" rx="15%"/><path fill="#fff" d="M373 431c-14 15-45 25-73 25h-3c-95 0-115-69-115-110V234h-37a8 8 0 0 1-8-8v-53a13 13 0 0 1 9-13c48-17 63-59 66-91 0-9 5-13 12-13h56a8 8 0 0 1 7 8v90h65a8 8 0 0 1 8 8v63a8 8 0 0 1-8 8h-65v104c0 26 17 34 28 34 10-1 20-4 25-6l10-2c3 1 5 3 6 7l17 50c2 4 3 8 0 11z" class="cls-1"/></svg>

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 452 B

View File

@@ -1 +1 @@
<svg fill="#e65e17" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Ubuntu" role="img"><rect height="512" rx="15%" width="512"/><circle cx="263" cy="256" fill="#fff" r="158"/><circle cx="263" cy="256" r="104"/><circle cx="79" cy="257" r="50"/><circle cx="79" cy="257" fill="#fff" r="38"/><circle cx="356" cy="417" r="50"/><circle cx="356" cy="417" fill="#fff" r="38"/><circle cx="356" cy="96" r="50"/><circle cx="356" cy="96" fill="#fff" r="38"/><path d="M427 266v-20h-64v20zM173 392l18 10 32-55-18-10zm18-283l-18 11 32 55 18-10z"/></svg>
<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Ubuntu" role="img"><rect fill="#e65e17" height="512" rx="15%" width="512"/><circle cx="268" cy="256" fill="#fff" r="158"/><circle cx="268" cy="256" fill="#e65e17" r="104"/><circle cx="84" cy="257" fill="#e65e17" r="50"/><circle cx="84" cy="257" fill="#fff" r="38"/><circle cx="361" cy="417" fill="#e65e17" r="50"/><circle cx="361" cy="417" fill="#fff" r="38"/><circle cx="361" cy="96" fill="#e65e17" r="50"/><circle cx="361" cy="96" fill="#fff" r="38"/><path d="m432 266v-20h-64v20zm-254 126 18 10 32-55-18-10zm18-283-18 11 32 55 18-10z" fill="#e65e17"/></svg>

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 634 B

View File

@@ -1 +1 @@
<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Wikipedia" role="img"><rect fill="#f3f3f3" height="512" rx="15%" width="512"/><path d="m57 147-1 1v7c0 2 2 3 5 3 21 1 21 5 29 24l94 205c7 15 17 17 26-1l47-92 44 92c8 16 17 17 25 0l90-203c8-18 20-25 37-25 2 0 3-1 3-3v-7l-1-1h-83l-1 1v7c0 2 2 3 4 3 11 0 30 2 22 20l-73 173-3-1-45-92 38-75c9-16 11-25 27-25 2 0 4-1 4-3v-7l-1-1h-67l-1 1v7c0 3 4 3 7 3 19 1 17 8 11 20l-29 58-26-54c-9-17-11-22 2-23 4-1 9-1 9-4v-7l-1-1h-72l-1 1v8c0 2 2 2 5 2 12 2 12 3 24 27l42 88-39 78-3-1-80-174c-8-18 3-17 19-18 3 0 3-1 3-3v-7l-1-1z" fill="#2f2f2f"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Wikipedia" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#282828" rx="15%"/><path fill="#fff" d="M57 130l-1 1v7c0 2 2 3 5 3 21 1 21 5 29 24l94 205c7 15 17 17 26-1l47-92 44 92c8 16 17 17 25 0l90-203c8-18 20-25 37-25 2 0 3-1 3-3v-7l-1-1h-83l-1 1v7c0 2 2 3 4 3 11 0 30 2 22 20l-73 173-3-1-45-92 38-75c9-16 11-25 27-25 2 0 4-1 4-3v-7l-1-1h-67l-1 1v7c0 3 4 3 7 3 19 1 17 8 11 20l-29 58-26-54c-9-17-11-22 2-23 4-1 9-1 9-4v-7l-1-1h-72l-1 1v8c0 2 2 2 5 2 12 2 12 3 24 27l42 88-39 78-3-1-80-174c-8-18 3-17 19-18 3 0 3-1 3-3v-7l-1-1z"/></svg>

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 608 B

View File

@@ -79,7 +79,10 @@
var urls = items.map(item => 'images/svg/' + item + '.svg');
var icons;
Promise.all(urls.map(url => fetch(url).then(res => res.text()))).then(all => {
icons = all;
icons = all.map(icon => {
return icon + '<b>' + icon.match(/aria-label\=\"(.*?)\"/)[1] + '</b>';
});
render(range.value);
});