From 9fa763c71c0c44d4e28d9b4c73a77d4432451542 Mon Sep 17 00:00:00 2001 From: Peter Piekarczyk Date: Wed, 10 May 2017 10:08:35 -0500 Subject: [PATCH 01/12] create package from npm --- package.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 00000000..cee700c2 --- /dev/null +++ b/package.json @@ -0,0 +1,14 @@ +{ + "name": "simple-icons", + "version": "1.0.0", + "description": "SVG icons for popular brands https://simpleicons.org", + "homepage": "https://www.simpleicons.org", + "keywords": [ + "svg", + "icons" + ], + "main": "_data/simple-icons.json", + "repository": "git@github.com:danleech/simple-icons.git", + "author": "Dan Leech", + "license": "MIT" +} From ec9afd6deb218d4ebfc90933f7a6199e11ab5a78 Mon Sep 17 00:00:00 2001 From: Peter Piekarczyk Date: Wed, 10 May 2017 10:13:00 -0500 Subject: [PATCH 02/12] switch license to CCO --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cee700c2..38d357d8 100644 --- a/package.json +++ b/package.json @@ -10,5 +10,5 @@ "main": "_data/simple-icons.json", "repository": "git@github.com:danleech/simple-icons.git", "author": "Dan Leech", - "license": "MIT" + "license": "CCO" } From b0ed9d164c9084f33147f0b3b26426afecb95009 Mon Sep 17 00:00:00 2001 From: Aleksandr Filatov Date: Mon, 10 Jul 2017 13:12:40 -0700 Subject: [PATCH 03/12] programming languages #469 --- _data/simple-icons.json | 78 +++++++++++++++++++++++++-- icons/c++.svg | 1 + icons/c.svg | 1 + icons/closure.svg | 50 ++++++++++++++++++ icons/coffeescript.svg | 1 + icons/go.svg | 68 ++++++++++++++++++++++++ icons/java.svg | 41 +++++++++++++++ icons/kotlin.svg | 1 + icons/lua.svg | 13 +++++ icons/php.svg | 1 + icons/powershell.svg | 29 +++++++++++ icons/python.svg | 113 ++++++++++++++++++++++++++++++++++++++++ icons/rust.svg | 18 +++++++ icons/scala.svg | 49 +++++++++++++++++ icons/swift.svg | 10 ++++ 15 files changed, 470 insertions(+), 4 deletions(-) create mode 100644 icons/c++.svg create mode 100644 icons/c.svg create mode 100644 icons/closure.svg create mode 100644 icons/coffeescript.svg create mode 100644 icons/go.svg create mode 100644 icons/java.svg create mode 100644 icons/kotlin.svg create mode 100644 icons/lua.svg create mode 100644 icons/php.svg create mode 100644 icons/powershell.svg create mode 100644 icons/python.svg create mode 100644 icons/rust.svg create mode 100644 icons/scala.svg create mode 100644 icons/swift.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index fd3abbd8..fc94090b 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -165,6 +165,16 @@ "hex": "EE3322", "source": "http://www.buzzfeed.com/press/downloads" }, + { + "title": "C", + "hex": "a9b9cb", + "source": "https://worldvectorlogo.com/ru/logo/c-2975" + }, + { + "title": "C++", + "hex": "004482", + "source": "https://isocpp.org/" + }, { "title": "CakePHP", "hex": "D33C43", @@ -180,6 +190,11 @@ "hex": "343434", "source": "https://circleci.com/press" }, + { + "title": "Closure", + "hex": "5881d8", + "source": "https://upload.wikimedia.org/wikipedia/commons/5/5d/Clojure_logo.svg" + }, { "title": "Code School", "hex": "4CADC0", @@ -215,6 +230,11 @@ "hex": "4574E0", "source": "https://codio.com" }, + { + "title": "СoffeeScript", + "hex": "29334c", + "source": "http://coffeescript.org/" + }, { "title": "ComproPago", "hex": "00AAEF", @@ -481,9 +501,14 @@ "source": "https://material.io/guidelines/resources/sticker-sheets-icons.html#sticker-sheets-icons-components" }, { - "title": "GNU", - "hex": "A42E2B", - "source": "https://gnu.org" + "title": "GNU", + "hex": "A42E2B", + "source": "https://gnu.org" + }, + { + "title": "Go", + "hex": "6ad7e5", + "source": "https://raw.githubusercontent.com/golang-samples/gopher-vector/master/gopher.svg" }, { "title": "GoldenLine", @@ -665,6 +690,11 @@ "hex": "CC0000", "source": "https://github.com/jekyll/brand" }, + { + "title": "Java", + "hex": "5382A1", + "source": "https://upload.wikimedia.org/wikipedia/en/3/30/Java_programming_language_logo.svg" + }, { "title": "JavaScript", "hex": "F7DF1E", @@ -740,6 +770,11 @@ "hex": "00B057", "source": "https://koding.com/About" }, + { + "title": "Kotlin", + "hex": "4bb8f6", + "source": "http://kotlinlang.org/" + }, { "title": "Lanyrd", "hex": "3C80CA", @@ -795,6 +830,11 @@ "hex": "CF202E", "source": "https://livestream.com/press" }, + { + "title": "Lua", + "hex": "000080", + "source": "https://upload.wikimedia.org/wikipedia/commons/6/6a/Lua-logo-nolabel.svg" + }, { "title": "Macy’s", "hex": "E11A2B", @@ -1035,6 +1075,16 @@ "hex": "40A4C4", "source": "https://www.periscope.tv/press" }, + { + "title": "PowerShell", + "hex": "2671be", + "source": "https://gist.github.com/Xainey/d5bde7d01dcbac51ac951810e94313aa" + }, + { + "title": "Php", + "hex": "777bb3", + "source": "https://en.wikipedia.org/wiki/File:PHP-logo.svg" + }, { "title": "Pinboard", "hex": "0000FF", @@ -1115,6 +1165,11 @@ "hex": "9497CE", "source": "https://protonmail.com/media-kit" }, + { + "title": "Python", + "hex": "387eb8", + "source": "https://upload.wikimedia.org/wikipedia/commons/c/c3/Python-logo-notext.svg" + }, { "title": "Quantopian", "hex": "C50000", @@ -1185,6 +1240,11 @@ "hex": "2DC9D7", "source": "https://runkeeper.com/partnerships" }, + { + "title": "Rust", + "hex": "000", + "source": "https://www.rust-lang.org/en-US/" + }, { "title": "Salesforce", "hex": "00A1E0", @@ -1200,6 +1260,11 @@ "hex": "E2231A", "source": "" }, + { + "title": "Scala", + "hex": "d50000", + "source": "https://github.com/kaeawc/scala-logo/blob/master/img/logo_shadow.svg" + }, { "title": "Scribd", "hex": "1A7BBA", @@ -1530,6 +1595,11 @@ "hex": "1DA1F2", "source": "https://brand.twitter.com" }, + { + "title": "Swift", + "hex": "fc3d26", + "source": "https://upload.wikimedia.org/wikipedia/commons/9/9d/Swift_logo.svg" + }, { "title": "Twoo", "hex": "FF7102", @@ -1741,4 +1811,4 @@ "source": "http://zillow.mediaroom.com/logos" } ] -} +} \ No newline at end of file diff --git a/icons/c++.svg b/icons/c++.svg new file mode 100644 index 00000000..a177a90e --- /dev/null +++ b/icons/c++.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/c.svg b/icons/c.svg new file mode 100644 index 00000000..e511a172 --- /dev/null +++ b/icons/c.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/closure.svg b/icons/closure.svg new file mode 100644 index 00000000..152078cc --- /dev/null +++ b/icons/closure.svg @@ -0,0 +1,50 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/icons/coffeescript.svg b/icons/coffeescript.svg new file mode 100644 index 00000000..d35b9f83 --- /dev/null +++ b/icons/coffeescript.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/go.svg b/icons/go.svg new file mode 100644 index 00000000..2026503d --- /dev/null +++ b/icons/go.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/java.svg b/icons/java.svg new file mode 100644 index 00000000..e60e4da3 --- /dev/null +++ b/icons/java.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + diff --git a/icons/kotlin.svg b/icons/kotlin.svg new file mode 100644 index 00000000..894dbfc0 --- /dev/null +++ b/icons/kotlin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/lua.svg b/icons/lua.svg new file mode 100644 index 00000000..b1e7ffcb --- /dev/null +++ b/icons/lua.svg @@ -0,0 +1,13 @@ + + + Lua programming language logo + + + + + + + + + + diff --git a/icons/php.svg b/icons/php.svg new file mode 100644 index 00000000..7ac50a15 --- /dev/null +++ b/icons/php.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/powershell.svg b/icons/powershell.svg new file mode 100644 index 00000000..ec01c8cb --- /dev/null +++ b/icons/powershell.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/icons/python.svg b/icons/python.svg new file mode 100644 index 00000000..366f52f3 --- /dev/null +++ b/icons/python.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/icons/rust.svg b/icons/rust.svg new file mode 100644 index 00000000..fd5c02e5 --- /dev/null +++ b/icons/rust.svg @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/icons/scala.svg b/icons/scala.svg new file mode 100644 index 00000000..127cc721 --- /dev/null +++ b/icons/scala.svg @@ -0,0 +1,49 @@ + + + + + Scala + The Scala Logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/icons/swift.svg b/icons/swift.svg new file mode 100644 index 00000000..69df9cd2 --- /dev/null +++ b/icons/swift.svg @@ -0,0 +1,10 @@ + + + + + + + + + + From 892e16f28f6c868b9e86509bca050b2e5325242b Mon Sep 17 00:00:00 2001 From: Aleksandr Filatov Date: Mon, 10 Jul 2017 13:17:57 -0700 Subject: [PATCH 04/12] Revert "programming languages #469" This reverts commit b0ed9d164c9084f33147f0b3b26426afecb95009. --- _data/simple-icons.json | 78 ++------------------------- icons/c++.svg | 1 - icons/c.svg | 1 - icons/closure.svg | 50 ------------------ icons/coffeescript.svg | 1 - icons/go.svg | 68 ------------------------ icons/java.svg | 41 --------------- icons/kotlin.svg | 1 - icons/lua.svg | 13 ----- icons/php.svg | 1 - icons/powershell.svg | 29 ----------- icons/python.svg | 113 ---------------------------------------- icons/rust.svg | 18 ------- icons/scala.svg | 49 ----------------- icons/swift.svg | 10 ---- 15 files changed, 4 insertions(+), 470 deletions(-) delete mode 100644 icons/c++.svg delete mode 100644 icons/c.svg delete mode 100644 icons/closure.svg delete mode 100644 icons/coffeescript.svg delete mode 100644 icons/go.svg delete mode 100644 icons/java.svg delete mode 100644 icons/kotlin.svg delete mode 100644 icons/lua.svg delete mode 100644 icons/php.svg delete mode 100644 icons/powershell.svg delete mode 100644 icons/python.svg delete mode 100644 icons/rust.svg delete mode 100644 icons/scala.svg delete mode 100644 icons/swift.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index fc94090b..fd3abbd8 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -165,16 +165,6 @@ "hex": "EE3322", "source": "http://www.buzzfeed.com/press/downloads" }, - { - "title": "C", - "hex": "a9b9cb", - "source": "https://worldvectorlogo.com/ru/logo/c-2975" - }, - { - "title": "C++", - "hex": "004482", - "source": "https://isocpp.org/" - }, { "title": "CakePHP", "hex": "D33C43", @@ -190,11 +180,6 @@ "hex": "343434", "source": "https://circleci.com/press" }, - { - "title": "Closure", - "hex": "5881d8", - "source": "https://upload.wikimedia.org/wikipedia/commons/5/5d/Clojure_logo.svg" - }, { "title": "Code School", "hex": "4CADC0", @@ -230,11 +215,6 @@ "hex": "4574E0", "source": "https://codio.com" }, - { - "title": "СoffeeScript", - "hex": "29334c", - "source": "http://coffeescript.org/" - }, { "title": "ComproPago", "hex": "00AAEF", @@ -501,14 +481,9 @@ "source": "https://material.io/guidelines/resources/sticker-sheets-icons.html#sticker-sheets-icons-components" }, { - "title": "GNU", - "hex": "A42E2B", - "source": "https://gnu.org" - }, - { - "title": "Go", - "hex": "6ad7e5", - "source": "https://raw.githubusercontent.com/golang-samples/gopher-vector/master/gopher.svg" + "title": "GNU", + "hex": "A42E2B", + "source": "https://gnu.org" }, { "title": "GoldenLine", @@ -690,11 +665,6 @@ "hex": "CC0000", "source": "https://github.com/jekyll/brand" }, - { - "title": "Java", - "hex": "5382A1", - "source": "https://upload.wikimedia.org/wikipedia/en/3/30/Java_programming_language_logo.svg" - }, { "title": "JavaScript", "hex": "F7DF1E", @@ -770,11 +740,6 @@ "hex": "00B057", "source": "https://koding.com/About" }, - { - "title": "Kotlin", - "hex": "4bb8f6", - "source": "http://kotlinlang.org/" - }, { "title": "Lanyrd", "hex": "3C80CA", @@ -830,11 +795,6 @@ "hex": "CF202E", "source": "https://livestream.com/press" }, - { - "title": "Lua", - "hex": "000080", - "source": "https://upload.wikimedia.org/wikipedia/commons/6/6a/Lua-logo-nolabel.svg" - }, { "title": "Macy’s", "hex": "E11A2B", @@ -1075,16 +1035,6 @@ "hex": "40A4C4", "source": "https://www.periscope.tv/press" }, - { - "title": "PowerShell", - "hex": "2671be", - "source": "https://gist.github.com/Xainey/d5bde7d01dcbac51ac951810e94313aa" - }, - { - "title": "Php", - "hex": "777bb3", - "source": "https://en.wikipedia.org/wiki/File:PHP-logo.svg" - }, { "title": "Pinboard", "hex": "0000FF", @@ -1165,11 +1115,6 @@ "hex": "9497CE", "source": "https://protonmail.com/media-kit" }, - { - "title": "Python", - "hex": "387eb8", - "source": "https://upload.wikimedia.org/wikipedia/commons/c/c3/Python-logo-notext.svg" - }, { "title": "Quantopian", "hex": "C50000", @@ -1240,11 +1185,6 @@ "hex": "2DC9D7", "source": "https://runkeeper.com/partnerships" }, - { - "title": "Rust", - "hex": "000", - "source": "https://www.rust-lang.org/en-US/" - }, { "title": "Salesforce", "hex": "00A1E0", @@ -1260,11 +1200,6 @@ "hex": "E2231A", "source": "" }, - { - "title": "Scala", - "hex": "d50000", - "source": "https://github.com/kaeawc/scala-logo/blob/master/img/logo_shadow.svg" - }, { "title": "Scribd", "hex": "1A7BBA", @@ -1595,11 +1530,6 @@ "hex": "1DA1F2", "source": "https://brand.twitter.com" }, - { - "title": "Swift", - "hex": "fc3d26", - "source": "https://upload.wikimedia.org/wikipedia/commons/9/9d/Swift_logo.svg" - }, { "title": "Twoo", "hex": "FF7102", @@ -1811,4 +1741,4 @@ "source": "http://zillow.mediaroom.com/logos" } ] -} \ No newline at end of file +} diff --git a/icons/c++.svg b/icons/c++.svg deleted file mode 100644 index a177a90e..00000000 --- a/icons/c++.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/c.svg b/icons/c.svg deleted file mode 100644 index e511a172..00000000 --- a/icons/c.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/closure.svg b/icons/closure.svg deleted file mode 100644 index 152078cc..00000000 --- a/icons/closure.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/icons/coffeescript.svg b/icons/coffeescript.svg deleted file mode 100644 index d35b9f83..00000000 --- a/icons/coffeescript.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/go.svg b/icons/go.svg deleted file mode 100644 index 2026503d..00000000 --- a/icons/go.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/java.svg b/icons/java.svg deleted file mode 100644 index e60e4da3..00000000 --- a/icons/java.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/icons/kotlin.svg b/icons/kotlin.svg deleted file mode 100644 index 894dbfc0..00000000 --- a/icons/kotlin.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/lua.svg b/icons/lua.svg deleted file mode 100644 index b1e7ffcb..00000000 --- a/icons/lua.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - Lua programming language logo - - - - - - - - - - diff --git a/icons/php.svg b/icons/php.svg deleted file mode 100644 index 7ac50a15..00000000 --- a/icons/php.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/powershell.svg b/icons/powershell.svg deleted file mode 100644 index ec01c8cb..00000000 --- a/icons/powershell.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/icons/python.svg b/icons/python.svg deleted file mode 100644 index 366f52f3..00000000 --- a/icons/python.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/icons/rust.svg b/icons/rust.svg deleted file mode 100644 index fd5c02e5..00000000 --- a/icons/rust.svg +++ /dev/null @@ -1,18 +0,0 @@ - - \ No newline at end of file diff --git a/icons/scala.svg b/icons/scala.svg deleted file mode 100644 index 127cc721..00000000 --- a/icons/scala.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - Scala - The Scala Logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/icons/swift.svg b/icons/swift.svg deleted file mode 100644 index 69df9cd2..00000000 --- a/icons/swift.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - From 95e3588af989ecf62f5f970af8fc7c64103ecd99 Mon Sep 17 00:00:00 2001 From: birjolaxew Date: Wed, 12 Jul 2017 00:02:16 +0200 Subject: [PATCH 05/12] Add .npmignore --- .npmignore | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .npmignore diff --git a/.npmignore b/.npmignore new file mode 100644 index 00000000..6be3879e --- /dev/null +++ b/.npmignore @@ -0,0 +1,8 @@ +# Ignore all files in root +/* +# Except the ones we want to publish +!_data/ +!icons/ +!package.json +!README.md +!LICENSE.md \ No newline at end of file From 1376b5f2553aac4854eb1a4cf4fb096c78cb4ccc Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 2 Aug 2017 15:43:02 +0200 Subject: [PATCH 06/12] Contrast ratio proof of concept Initial implementation of making icons/text dark on a light background, as suggested in issue #480. This implementation is based on the suggestion by @pushrax, using the formula provided on http://chilliant.blogspot.nl/2012/08/srgb-approximations-for-hlsl.html Note that this implementation is not yet as desired, as it still darkens some icons we might not want darkened and the dark color is currently full black. I also used this link in the process of making this: http://springmeier.org/www/contrastcalculator/index.php --- index.html | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index a933acbc..b91a2c52 100644 --- a/index.html +++ b/index.html @@ -60,6 +60,32 @@ {% if rgbBlue < rgbMin %} {% assign rgbMin = rgbBlue %} {% endif %} + + + {% if rgbRed <= 0.03928 %} + {% assign lRed = rgbRed | divided_by: 12.92 | times: 0.2126 %} + {% else %} + {% assign lRed = rgbRed | times: 0.3053 | plus: 0.6822 | times: rgbRed | plus: 0.0125 | times: rgbRed | times: 0.2126 %} + {% endif %} + {% if rgbGreen <= 0.03928 %} + {% assign lGreen = rgbGreen | divided_by: 12.92 | times: 0.7152 %} + {% else %} + {% assign lGreen = rgbGreen | times: 0.3053 | plus: 0.6822 | times: rgbGreen | plus: 0.0125 | times: rgbGreen | times: 0.7152 %} + {% endif %} + {% if rgbBlue <= 0.03928 %} + {% assign lBlue = rgbBlue | divided_by: 12.92 | times: 0.0722 %} + {% else %} + {% assign lBlue = rgbBlue | times: 0.3053 | plus: 0.6822 | times: rgbBlue | plus: 0.0125 | times: rgbBlue | times: 0.0722 %} + {% endif %} + {% assign L = lRed | plus: lGreen | plus: lBlue %} + + {% if L >= 0.6 %} + {% assign class = "dark" %} + {% else %} + {% assign class = "light" %} + {% endif %} + + {% assign hslLuminance = rgbMax | plus: rgbMin | times: 50.0 %} {% assign rgbDelta = rgbMax | minus: rgbMin %} {% if rgbDelta == 0 %} @@ -84,10 +110,10 @@ {% endif %} {% if hslSaturation < 10 %} {% assign hslLuminance = hslLuminance | round: 0 | prepend: "000" | slice: -3, 3 %} - {% capture greyscaleIconsUnsortedString %}{{ greyscaleIconsUnsortedString }}{{ hslLuminance }},{{ filename }},{{ hslHue }},{{ hslSaturation }},{{ hex }},{{ title }}{% unless forloop.last %};{% endunless %}{% endcapture %} + {% capture greyscaleIconsUnsortedString %}{{ greyscaleIconsUnsortedString }}{{ hslLuminance }},{{ filename }},{{ hslHue }},{{ hslSaturation }},{{ hex }},{{ title }},{{ class }},{{ L }}{% 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 }}{% unless forloop.last %};{% endunless %}{% endcapture %} + {% capture iconsUnsortedString %}{{ iconsUnsortedString }}{{ hslHue }},{{ hslSaturation }},{{ hslLuminance }},{{ filename }},{{ hex }},{{ title }},{{ class }},{{ L }}{% unless forloop.last %};{% endunless %}{% endcapture %} {% endif %} {% endfor %} {% assign iconsArray = iconsUnsortedString | split: ";" %} @@ -158,9 +184,22 @@ width: 1.5rem; } - path, rect, circle { + .grid-item.light path, + .grid-item.light rect, + .grid-item.light circle, + .grid-item.light h2, + .grid-item.light p { + color: #FFF; fill: #FFF; } + .grid-item.dark path, + .grid-item.dark rect, + .grid-item.dark circle, + .grid-item.dark h2, + .grid-item.dark p { + color: #000; + fill: #000; + } #carbonads { height: 100%; @@ -461,7 +500,7 @@ {% for icon in iconsArray %} {% assign iconArray = icon | split: "," %} -
  • +
  • {% assign filePath = iconArray[3] | prepend: "icons/" | append: ".svg" %} {% include_relative {{ filePath }} %} @@ -472,7 +511,7 @@ {% endfor %} {% for icon in greyscaleIconsArray %} {% assign iconArray = icon | split: "," %} -
  • +
  • {% assign filePath = iconArray[1] | prepend: "icons/" | append: ".svg" %} {% include_relative {{ filePath }} %} From 8e3028c5fc27a4102642d8b107b6a5edc2e28c4e Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 2 Aug 2017 15:48:58 +0200 Subject: [PATCH 07/12] Tweak Luminance thresold for darkened icon --- index.html | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index b91a2c52..111e324f 100644 --- a/index.html +++ b/index.html @@ -61,7 +61,6 @@ {% assign rgbMin = rgbBlue %} {% endif %} - {% if rgbRed <= 0.03928 %} {% assign lRed = rgbRed | divided_by: 12.92 | times: 0.2126 %} {% else %} @@ -77,15 +76,13 @@ {% else %} {% assign lBlue = rgbBlue | times: 0.3053 | plus: 0.6822 | times: rgbBlue | plus: 0.0125 | times: rgbBlue | times: 0.0722 %} {% endif %} - {% assign L = lRed | plus: lGreen | plus: lBlue %} - - {% if L >= 0.6 %} + {% assign luminance = lRed | plus: lGreen | plus: lBlue %} + {% if luminance >= 0.83 %} {% assign class = "dark" %} {% else %} {% assign class = "light" %} {% endif %} - {% assign hslLuminance = rgbMax | plus: rgbMin | times: 50.0 %} {% assign rgbDelta = rgbMax | minus: rgbMin %} {% if rgbDelta == 0 %} @@ -110,10 +107,10 @@ {% endif %} {% if hslSaturation < 10 %} {% assign hslLuminance = hslLuminance | round: 0 | prepend: "000" | slice: -3, 3 %} - {% capture greyscaleIconsUnsortedString %}{{ greyscaleIconsUnsortedString }}{{ hslLuminance }},{{ filename }},{{ hslHue }},{{ hslSaturation }},{{ hex }},{{ title }},{{ class }},{{ L }}{% unless forloop.last %};{% endunless %}{% endcapture %} + {% capture greyscaleIconsUnsortedString %}{{ greyscaleIconsUnsortedString }}{{ hslLuminance }},{{ filename }},{{ hslHue }},{{ hslSaturation }},{{ hex }},{{ title }},{{ class }}{% 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 }},{{ L }}{% unless forloop.last %};{% endunless %}{% endcapture %} + {% capture iconsUnsortedString %}{{ iconsUnsortedString }}{{ hslHue }},{{ hslSaturation }},{{ hslLuminance }},{{ filename }},{{ hex }},{{ title }},{{ class }}{% unless forloop.last %};{% endunless %}{% endcapture %} {% endif %} {% endfor %} {% assign iconsArray = iconsUnsortedString | split: ";" %} From 553aa4b8fbbf9357fc7367c6110cfdf94cc2e63b Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 3 Aug 2017 13:13:31 +0200 Subject: [PATCH 08/12] Use BEM naming and inherit colors --- index.html | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/index.html b/index.html index 111e324f..24a8994d 100644 --- a/index.html +++ b/index.html @@ -78,9 +78,9 @@ {% endif %} {% assign luminance = lRed | plus: lGreen | plus: lBlue %} {% if luminance >= 0.83 %} - {% assign class = "dark" %} + {% assign class = "grid-item--dark" %} {% else %} - {% assign class = "light" %} + {% assign class = "grid-item--light" %} {% endif %} {% assign hslLuminance = rgbMax | plus: rgbMin | times: 50.0 %} @@ -177,27 +177,11 @@ } svg { + fill: currentColor; height: 1.5rem; width: 1.5rem; } - .grid-item.light path, - .grid-item.light rect, - .grid-item.light circle, - .grid-item.light h2, - .grid-item.light p { - color: #FFF; - fill: #FFF; - } - .grid-item.dark path, - .grid-item.dark rect, - .grid-item.dark circle, - .grid-item.dark h2, - .grid-item.dark p { - color: #000; - fill: #000; - } - #carbonads { height: 100%; width: 100%; @@ -376,6 +360,15 @@ background-color: #757575; text-align: center; } + .grid-item--light { + color: #FFF; + } + .grid-item--dark { + color: #000; + } + .grid-item__link { + color: inherit; + } @supports not (display: grid) { .grid-item { border: 0.1875rem solid #FFF; @@ -402,7 +395,6 @@ } .grid-item__link { - color: #FFFFFF; display: block; padding: 1rem 1rem 0; text-align: center; @@ -425,7 +417,6 @@ } .grid-item__subtitle { - color: #FFFFFF; font-size: 0.75rem; line-height: 1rem; margin: 0; From 25a4350882c9a8efaf56f72b4ab95657d09ab160 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 3 Aug 2017 13:15:39 +0200 Subject: [PATCH 09/12] Change dark color to dark gray instead of black --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 24a8994d..520dd63e 100644 --- a/index.html +++ b/index.html @@ -364,7 +364,7 @@ color: #FFF; } .grid-item--dark { - color: #000; + color: #222; } .grid-item__link { color: inherit; From 932483410bfdb4fe3dd277593f86157b3f365e07 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 3 Aug 2017 13:48:59 +0200 Subject: [PATCH 10/12] Remove fill attributes from all SVGs --- icons/codeigniter.svg | 2 +- icons/discourse.svg | 2 +- icons/ethereum.svg | 2 +- icons/instapaper.svg | 2 +- icons/mozilla.svg | 2 +- icons/nintendoswitch.svg | 2 +- icons/nodejs.svg | 2 +- icons/pinboard.svg | 2 +- icons/sentiayoga.svg | 2 +- icons/zendesk.svg | 2 +- icons/zerply.svg | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/icons/codeigniter.svg b/icons/codeigniter.svg index 91a356a7..fbbbb1f5 100644 --- a/icons/codeigniter.svg +++ b/icons/codeigniter.svg @@ -1 +1 @@ -Artboard \ No newline at end of file +Artboard \ No newline at end of file diff --git a/icons/discourse.svg b/icons/discourse.svg index 14ba1a52..888de16c 100644 --- a/icons/discourse.svg +++ b/icons/discourse.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/ethereum.svg b/icons/ethereum.svg index 8d800255..5f8b5ef6 100644 --- a/icons/ethereum.svg +++ b/icons/ethereum.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/instapaper.svg b/icons/instapaper.svg index 17dc9162..d8481295 100644 --- a/icons/instapaper.svg +++ b/icons/instapaper.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/mozilla.svg b/icons/mozilla.svg index b27a9299..d3e97153 100644 --- a/icons/mozilla.svg +++ b/icons/mozilla.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/nintendoswitch.svg b/icons/nintendoswitch.svg index 7329734e..4c41f963 100644 --- a/icons/nintendoswitch.svg +++ b/icons/nintendoswitch.svg @@ -1 +1 @@ -Shape \ No newline at end of file +Shape \ No newline at end of file diff --git a/icons/nodejs.svg b/icons/nodejs.svg index 18f55ad7..303cc1fb 100644 --- a/icons/nodejs.svg +++ b/icons/nodejs.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/pinboard.svg b/icons/pinboard.svg index be02c803..c6aa782a 100644 --- a/icons/pinboard.svg +++ b/icons/pinboard.svg @@ -1 +1 @@ -Shape \ No newline at end of file +Shape \ No newline at end of file diff --git a/icons/sentiayoga.svg b/icons/sentiayoga.svg index 2cd94e41..5ce59bfb 100644 --- a/icons/sentiayoga.svg +++ b/icons/sentiayoga.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/zendesk.svg b/icons/zendesk.svg index bab8caba..88f29e27 100644 --- a/icons/zendesk.svg +++ b/icons/zendesk.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/zerply.svg b/icons/zerply.svg index 39482dbc..9fe755df 100644 --- a/icons/zerply.svg +++ b/icons/zerply.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 138cca3e6c00c6ca03777b2efbca713de21a7ba6 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 17 Aug 2017 13:24:59 +0200 Subject: [PATCH 11/12] Add building instructions to CONTRIBUTING.md --- CONTRIBUTING.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2030f178..cd7e7f39 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ This repository welcomes contributions and corrections. Before submitting a pull ## JSON data for simpleicons.org In addition to following the guidelines for SVGs, list new icons in the `_data/simple-icons.json` file. Each icon in the array has three required values: - + - The `title` of the new SVG. - A `hex` color value that matches the brand or logo's main accent color. (Without the `#` pound symbol.) - The `source` URL of the logo being used. @@ -50,3 +50,12 @@ Here is the un-minified contents of the GitHub icon, for reference: ``` +* * * + +# Building locally + +Make sure you have [Ruby](https://www.ruby-lang.org/en/downloads/) and [Jekyll](https://jekyllrb.com/) installed (using `$ gem install jekyll bundler`). Then follow these steps: +- Initialize this repository as a new Jekyll project using `$ jekyll new . --force` from the root of the repo. +- Remove the newly generated `index.md` file. +- Build and run the website locally using `$ bundle exec jekyll serve`. +- Connect to the website in your browser via the "Server address" provided by the output of this command, e.g. `http://localhost:4000/` From 5971f9354834941383f539280a38ea9bda6ff00b Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 17 Aug 2017 15:01:30 +0200 Subject: [PATCH 12/12] Use `jekyll serve` in build instructions --- CONTRIBUTING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd7e7f39..ed737ebd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -54,8 +54,7 @@ Here is the un-minified contents of the GitHub icon, for reference: # Building locally -Make sure you have [Ruby](https://www.ruby-lang.org/en/downloads/) and [Jekyll](https://jekyllrb.com/) installed (using `$ gem install jekyll bundler`). Then follow these steps: -- Initialize this repository as a new Jekyll project using `$ jekyll new . --force` from the root of the repo. -- Remove the newly generated `index.md` file. -- Build and run the website locally using `$ bundle exec jekyll serve`. +- Make sure you have [Ruby](https://www.ruby-lang.org/en/downloads/) installed. +- Make sure you have [Jekyll](https://jekyllrb.com/) installed (using `$ gem install jekyll bundler`). +- Build and run the website locally using `$ jekyll serve`. - Connect to the website in your browser via the "Server address" provided by the output of this command, e.g. `http://localhost:4000/`