From 936a91503414ad4f3d8be5fc949a099fcd7d81b7 Mon Sep 17 00:00:00 2001 From: Simon Ker Date: Tue, 12 Dec 2017 10:26:46 +0000 Subject: [PATCH 01/14] add xcode addresses #701 --- _data/simple-icons.json | 5 +++++ icons/xcode.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/xcode.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index a5d91b6a6..8b6134cb6 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1900,6 +1900,11 @@ "hex": "107C10", "source": "http://mspartner-public.sharepoint.com/XBOX%20Games/Xbox%20logo's%20+%20Guidelines/Xbox%20Live/Xbox_Live_Guidelines_10-4-13.pdf" }, + { + "title": "xcode", + "hex": "1575f9", + "source": "https://developer.apple.com/develop/" + }, { "title": "Xero", "hex": "13B5EA", diff --git a/icons/xcode.svg b/icons/xcode.svg new file mode 100644 index 000000000..eea49f638 --- /dev/null +++ b/icons/xcode.svg @@ -0,0 +1 @@ +xcode icon \ No newline at end of file From dd9326b809f2bfc3b80f9142a83713183f6254ed Mon Sep 17 00:00:00 2001 From: Simon Ker Date: Tue, 12 Dec 2017 11:26:44 +0000 Subject: [PATCH 02/14] add xcode icon --- _data/simple-icons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 8b6134cb6..2dd78dbc9 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1902,7 +1902,7 @@ }, { "title": "xcode", - "hex": "1575f9", + "hex": "1575F9", "source": "https://developer.apple.com/develop/" }, { From 4f7d8682ea4cb273645f1517392c1feae5fa15f0 Mon Sep 17 00:00:00 2001 From: Simon Ker Date: Tue, 12 Dec 2017 12:51:08 +0000 Subject: [PATCH 03/14] Fix capitalization in Json --- _data/simple-icons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 2dd78dbc9..e3ce7f843 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1901,7 +1901,7 @@ "source": "http://mspartner-public.sharepoint.com/XBOX%20Games/Xbox%20logo's%20+%20Guidelines/Xbox%20Live/Xbox_Live_Guidelines_10-4-13.pdf" }, { - "title": "xcode", + "title": "Xcode", "hex": "1575F9", "source": "https://developer.apple.com/develop/" }, From 1930a843659569166de1b542c7277f4d7754fe33 Mon Sep 17 00:00:00 2001 From: Simon Ker Date: Tue, 12 Dec 2017 13:21:55 +0000 Subject: [PATCH 04/14] Fix capitalization in svg --- icons/xcode.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/xcode.svg b/icons/xcode.svg index eea49f638..e70b0f96e 100644 --- a/icons/xcode.svg +++ b/icons/xcode.svg @@ -1 +1 @@ -xcode icon \ No newline at end of file +Xcode icon \ No newline at end of file From 720a15e8b4c13e818b47cc9e2b54b795f048ae48 Mon Sep 17 00:00:00 2001 From: Simon Ker Date: Wed, 13 Dec 2017 13:51:48 +0000 Subject: [PATCH 05/14] Add Known Icon #709 --- _data/simple-icons.json | 5 +++++ icons/known.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/known.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index e3ce7f843..dcd9a9b9e 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -860,6 +860,11 @@ "hex": "E44600", "source": "https://klout.com/s/developers/styleguide" }, + { + "title": "Known", + "hex": "333333", + "source": "https://withknown.com/img/logo_k.png" + }, { "title": "Koding", "hex": "00B057", diff --git a/icons/known.svg b/icons/known.svg new file mode 100644 index 000000000..f8f21a024 --- /dev/null +++ b/icons/known.svg @@ -0,0 +1 @@ +Known icon \ No newline at end of file From 8733b846a8b86e7932e22451d62071ca055bd4dd Mon Sep 17 00:00:00 2001 From: Simon Ker Date: Wed, 13 Dec 2017 13:53:21 +0000 Subject: [PATCH 06/14] Add Known Icon #709 fix aria label --- icons/known.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/known.svg b/icons/known.svg index f8f21a024..bb44c15b7 100644 --- a/icons/known.svg +++ b/icons/known.svg @@ -1 +1 @@ -Known icon \ No newline at end of file +Known icon \ No newline at end of file From 360348257fc15604b53b8efea87a652220caebd5 Mon Sep 17 00:00:00 2001 From: William Owen Date: Mon, 18 Dec 2017 20:27:42 +0000 Subject: [PATCH 07/14] Added nodemon (#724) * Added nodemon * Update nodemon.svg * Add missing keyword "icon" to nodemon.svg --- _data/simple-icons.json | 5 +++++ icons/nodemon.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/nodemon.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index e3ce7f843..ab3a6334d 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1120,6 +1120,11 @@ "hex": "339933", "source": "https://nodejs.org/en/about/resources/" }, + { + "title": "Nodemon", + "hex": "76D04B", + "source": "https://nodemon.io/" + }, { "title": "NPM", "hex": "CB3837", diff --git a/icons/nodemon.svg b/icons/nodemon.svg new file mode 100644 index 000000000..e74921946 --- /dev/null +++ b/icons/nodemon.svg @@ -0,0 +1 @@ +Nodemon icon From 98cf145270881567805b17652527a3c3bde2ac53 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 21 Dec 2017 22:32:01 +0100 Subject: [PATCH 08/14] Order icons alphabetically --- index.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index fda092f50..0ccc1be60 100644 --- a/index.html +++ b/index.html @@ -36,11 +36,13 @@ {% endcase %} {% unless forloop.last %}{% assign rgbString = rgbString | append: "," %}{% endunless %} {% endfor %} + {% assign rgbArray = rgbString | split: "," %} {% assign rgbRed = rgbArray[0] | times: 16 | plus: rgbArray[1] | divided_by: 255.0 | round: 2 %} {% assign rgbGreen = rgbArray[2] | times: 16 | plus: rgbArray[3] | divided_by: 255.0 | round: 2 %} {% assign rgbBlue = rgbArray[4] | times: 16 | plus: rgbArray[5] | divided_by: 255.0 | round: 2 %} {% assign rgbMax = 0.0 %} + {% if rgbRed > rgbMax %} {% assign rgbMax = rgbRed %} {% endif %} @@ -105,18 +107,17 @@ {% endif %} {% assign hslHue = hslHue | plus: 90.0 | modulo: 360.0 %} {% endif %} + {% if hslSaturation < 10 %} {% assign hslLuminance = hslLuminance | round: 0 | prepend: "000" | slice: -3, 3 %} - {% capture greyscaleIconsUnsortedString %}{{ greyscaleIconsUnsortedString }}{{ hslLuminance }},{{ filename }},{{ hslHue }},{{ hslSaturation }},{{ hex }},{{ title }},{{ class }}{% unless forloop.last %};{% endunless %}{% endcapture %} + {% capture greyscaleIconsUnsortedString %}{{ greyscaleIconsUnsortedString }}{{ hslLuminance }},{{ filename }},{{ hslHue }},{{ hslSaturation }},{{ hex }},{{ title }},{{ class }},{{ forloop.index }}{% unless forloop.last %};{% endunless %}{% endcapture %} {% else %} {% assign hslHue = hslHue | round: 0 | prepend: "000" | slice: -3, 3 %} - {% capture iconsUnsortedString %}{{ iconsUnsortedString }}{{ hslHue }},{{ hslSaturation }},{{ hslLuminance }},{{ filename }},{{ hex }},{{ title }},{{ class }}{% unless forloop.last %};{% endunless %}{% endcapture %} + {% capture iconsUnsortedString %}{{ iconsUnsortedString }}{{ hslHue }},{{ hslSaturation }},{{ hslLuminance }},{{ filename }},{{ hex }},{{ title }},{{ class }},{{ forloop.index }}{% unless forloop.last %};{% endunless %}{% endcapture %} {% endif %} {% endfor %} -{% assign iconsArray = iconsUnsortedString | split: ";" %} -{% assign iconsArray = iconsArray | sort %} -{% assign greyscaleIconsArray = greyscaleIconsUnsortedString | split: ";" %} -{% assign greyscaleIconsArray = greyscaleIconsArray | sort | reverse %} +{% assign iconsArray = iconsUnsortedString | split: ";" | sort %} +{% assign greyscaleIconsArray = greyscaleIconsUnsortedString | split: ";" | sort | reverse %} @@ -498,24 +499,24 @@ {% for icon in iconsArray %} {% assign iconArray = icon | split: "," %} -
  • +
  • {% assign filePath = iconArray[3] | prepend: "icons/" | append: ".svg" %} {% include_relative {{ filePath }} %}

    {{ iconArray[5] }}

     -

    #{{ iconArray[4] }}

    +

    #{{ iconArray[4] }} - {{ iconArray[7] }}

    • {% endfor %} {% for icon in greyscaleIconsArray %} {% assign iconArray = icon | split: "," %} -
  • +
  • {% assign filePath = iconArray[1] | prepend: "icons/" | append: ".svg" %} {% include_relative {{ filePath }} %}

    {{ iconArray[5] }}

     -

    #{{ iconArray[4] }}

    +

    #{{ iconArray[4] }} - {{ iconArray[7] }}

    • {% endfor %} From 75bd74ff6cbf51e13396540e38ff1e003cdf2021 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 21 Dec 2017 22:54:11 +0100 Subject: [PATCH 09/14] Add buttons to sort either on color or alphabet As suggested by @rosslh, add buttons to choose how you want to sort the icons. --- index.html | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 0ccc1be60..3f77232d3 100644 --- a/index.html +++ b/index.html @@ -276,6 +276,8 @@ } .search { + display: flex; + align-items: center; margin: 1rem 1.5rem; text-align: center; } @@ -320,6 +322,21 @@ padding-right: 32px; } + .sort-btn { + cursor: pointer; + margin-left: .5rem; + opacity: .5; + } + .sort-btn.active { + opacity: 1; + } + .sort-btn:hover { + opacity: .8; + } + .sort-btn:first-of-type { + margin-left: 1rem; + } + .grid { display: flex; flex-wrap: wrap; @@ -492,6 +509,9 @@
    ×
    + + Sort colors + Sort alphabetically @@ -543,7 +563,9 @@ $icons = $grid.querySelectorAll('.grid-item:not(.grid-item--ad)'), $search = document.querySelector('.search'), $searchClose = $search.querySelector('.search__close'), - $searchInput = $search.querySelector('input'); + $searchInput = $search.querySelector('input'), + $sortColor = document.getElementById('test-color'), + $sortAlpha = document.getElementById('test-alphabetically'); // Remove the "disabled" attribute from the search input $searchInput.setAttribute('title', 'Search Simple Icons'); @@ -681,6 +703,19 @@ window.history.replaceState(null, '', '/'); search(''); }, false); + + $sortColor.addEventListener('click', function() { + $icons.forEach(icon => { icon.style.order = null; }); + + $sortColor.classList.add('active'); + $sortAlpha.classList.remove('active'); + }); + $sortAlpha.addEventListener('click', function() { + $icons.forEach(icon => { icon.style.order = icon.getAttribute('order'); }); + + $sortAlpha.classList.add('active'); + $sortColor.classList.remove('active'); + }); })( document ); From 5f6f80256e205445a7401b2fc407033f6bd785b7 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Fri, 22 Dec 2017 19:28:01 +0100 Subject: [PATCH 10/14] Fix React, 500px, Coursera, Codecademy and Co-op (#725) * Update React Icon and color Updated the Icon as part of #588, found the color was incorrect as well (new color is extracted from the SVG on the source site). * Update Coursera icon, color and link Updated the Coursera icon based on the one I found on the updated source, also updated the color. * Update Co-op icon and color Updated the Co-op icon based on the SVG in the header on the provided source, also updated the color based on the same SVG. * Update 500px icon Updated the 500px icon based on the icon found in the provided source. --- _data/simple-icons.json | 10 +++++----- icons/500px.svg | 2 +- icons/codecademy.svg | 2 +- icons/coop.svg | 2 +- icons/coursera.svg | 2 +- icons/react.svg | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index ab3a6334d..215921420 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -242,7 +242,7 @@ }, { "title": "Codecademy", - "hex": "204056", + "hex": "1F4056", "source": "https://www.codecademy.com/" }, { @@ -292,13 +292,13 @@ }, { "title": "Co-op", - "hex": "00A1CC", + "hex": "00B1E7", "source": "http://www.co-operative.coop/corporate/press/logos/" }, { "title": "Coursera", - "hex": "757575", - "source": "https://www.coursera.org" + "hex": "2A73CC", + "source": "https://about.coursera.org/press" }, { "title": "CSS3", @@ -1327,7 +1327,7 @@ }, { "title": "React", - "hex": "00D8FF", + "hex": "61DAFB", "source": "https://facebook.github.io/react/" }, { diff --git a/icons/500px.svg b/icons/500px.svg index c62a9c4f0..4c631911a 100644 --- a/icons/500px.svg +++ b/icons/500px.svg @@ -1 +1 @@ -500px icon \ No newline at end of file +500px icon \ No newline at end of file diff --git a/icons/codecademy.svg b/icons/codecademy.svg index 8c21bf7bc..29154cf9f 100644 --- a/icons/codecademy.svg +++ b/icons/codecademy.svg @@ -1 +1 @@ -Codecademy icon \ No newline at end of file +Codecademy icon \ No newline at end of file diff --git a/icons/coop.svg b/icons/coop.svg index 5c1ca2fdc..b7fc5828a 100644 --- a/icons/coop.svg +++ b/icons/coop.svg @@ -1 +1 @@ -Co-op icon \ No newline at end of file +Co-op icon \ No newline at end of file diff --git a/icons/coursera.svg b/icons/coursera.svg index d0d734e36..7be9a279c 100644 --- a/icons/coursera.svg +++ b/icons/coursera.svg @@ -1 +1 @@ -Coursera icon \ No newline at end of file +Coursera icon \ No newline at end of file diff --git a/icons/react.svg b/icons/react.svg index f71dbe38e..fec8a4668 100644 --- a/icons/react.svg +++ b/icons/react.svg @@ -1 +1 @@ -React icon \ No newline at end of file +React icon \ No newline at end of file From 5cb1ffdef07bd147e4a9e8a3b18a70c517384949 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Fri, 22 Dec 2017 22:53:02 +0100 Subject: [PATCH 11/14] Remove "temp-" ID prefixes --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 3f77232d3..ed45712c5 100644 --- a/index.html +++ b/index.html @@ -510,8 +510,8 @@ - Sort colors - Sort alphabetically + Sort on colors + Sort alphabetically
    • @@ -564,8 +564,8 @@ $search = document.querySelector('.search'), $searchClose = $search.querySelector('.search__close'), $searchInput = $search.querySelector('input'), - $sortColor = document.getElementById('test-color'), - $sortAlpha = document.getElementById('test-alphabetically'); + $sortColor = document.getElementById('sort-color'), + $sortAlpha = document.getElementById('sort-alphabetically'); // Remove the "disabled" attribute from the search input $searchInput.setAttribute('title', 'Search Simple Icons'); From 31dbee22bf6a85ff6122597673d8277888c070b6 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Fri, 22 Dec 2017 23:20:01 +0100 Subject: [PATCH 12/14] Update hover animation for sort buttons The sort button for colors now shows a range of reds when hovered, whereas the sort button for alphabetic sorting just highlights the letters when hovered. --- index.html | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index ed45712c5..3777ab600 100644 --- a/index.html +++ b/index.html @@ -330,13 +330,35 @@ .sort-btn.active { opacity: 1; } - .sort-btn:hover { - opacity: .8; - } .sort-btn:first-of-type { margin-left: 1rem; } + .sort-btn:hover { + opacity: 1; + } + .sort-btn:hover path:first-of-type { + opacity: 0.8; + } + + #sort-color:hover path:nth-of-type(2) { + fill: #E57373; + } + #sort-color:hover path:nth-of-type(3) { + fill: #F44336; + } + #sort-color:hover path:nth-of-type(4) { + fill: #D32F2F; + } + #sort-color:hover path:nth-of-type(5) { + fill: #B71C1C; + } + + #sort-alphabetically:hover path:nth-of-type(2), + #sort-alphabetically:hover path:nth-of-type(3) { + opacity: 1; + } + .grid { display: flex; flex-wrap: wrap; @@ -510,8 +532,8 @@ - Sort on colors - Sort alphabetically + Sort on colors + Sort alphabetically
      • From 23e3aab6ca81ca84c11c9cb2b0114ad0c9d0c989 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Sat, 23 Dec 2017 10:44:29 +0100 Subject: [PATCH 13/14] Change "Sort on colors" to "Sort by color" --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3777ab600..f5cf9e6e8 100644 --- a/index.html +++ b/index.html @@ -532,7 +532,7 @@ - Sort on colors + Sort by color Sort alphabetically
          From f15dc5f26dda7d0dc78b0c32ffaecff4c51107bb Mon Sep 17 00:00:00 2001 From: Johan Fagerberg Date: Sat, 23 Dec 2017 17:23:39 +0100 Subject: [PATCH 14/14] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 798414400..78adb3834 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.2.16", + "version": "1.2.17", "description": "SVG icons for popular brands https://simpleicons.org", "homepage": "https://www.simpleicons.org", "keywords": [