Merge remote-tracking branch 'upstream/develop' into develop

2024-11-26 01:00:27 +02:00 · 2017-09-14 07:13:18 -06:00 · 2017-09-14 07:13:18 -06:00 · 859038a00a
commit 859038a00a
parent 2a9a789f69 e75b2766fb
7 changed files with 81 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -37,3 +37,7 @@ Temporary Items
 *.css.map

 # End of https://www.gitignore.io/api/sass,macos,jekyll
+
+
+# NPM dependencies
+node_modules/
--- a/.jsonlintschema
+++ b/.jsonlintschema
@ -0,0 +1,34 @@
+{
+    "title": "Simple Icons",
+    "type": "object",
+    "properties": {
+        "icons": {
+            "description": "The list of icons",
+            "type": "array",
+            "items": {
+                "description": "A single icon",
+                "type": "object",
+                "properties": {
+                    "title": {
+                        "description": "The icons name",
+                        "type": "string",
+                        "required": true
+                    },
+                    "hex": {
+                        "description": "The icons color, as HEX (without #)",
+                        "type": "string",
+                        "pattern": "^[0-9A-F]{6}$",
+                        "required": true
+                    },
+                    "source": {
+                        "description": "The website from which the icon originated",
+                        "type": "string",
+                        "pattern": "^https?://",
+                        "required": true
+                    }
+                },
+                "required": true
+            }
+        }
+    }
+}
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - "6"
+
+script:
+  - npm run jsonlint
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change
--- a/_data/simple-icons.json
+++ b/_data/simple-icons.json
@ -123,7 +123,7 @@
        {
            "title": "Bath ASU",
            "hex": "00A3E0",
-            "source": ""
+            "source": "https://bathasu.com/press/"
        },
        {
            "title": "Bebo",
@ -203,12 +203,12 @@
        {
            "title": "Codecademy",
            "hex": "204056",
-            "source": ""
+            "source": "https://www.codecademy.com/"
        },
        {
            "title": "Codeforces",
            "hex": "1F8ACB",
-            "source": ""
+            "source": "http://codeforces.com/"
        },
        {
            "title": "CodeIgniter",
@ -448,7 +448,7 @@
        {
            "title": "Gauges",
            "hex": "339966",
-            "source": ""
+            "source": "http://get.gaug.es/"
        },
        {
            "title": "Geeklist",
@ -488,7 +488,7 @@
        {
            "title": "Gitter",
            "hex": "FF0064",
-            "source": ""
+            "source": "https://gitter.im/"
        },
        {
            "title": "Glassdoor",
@ -513,7 +513,7 @@
        {
            "title": "Goodreads",
            "hex": "663300",
-            "source": ""
+            "source": "https://www.goodreads.com/about/press"
        },
        {
            "title": "Google",
@ -673,7 +673,7 @@
        {
            "title": "Instapaper",
            "hex": "1F1F1F",
-            "source": ""
+            "source": "https://www.instapaper.com/"
        },
        {
            "title": "Intel",
@ -873,7 +873,7 @@
        {
            "title": "Meetup",
            "hex": "E2373C",
-            "source": ""
+            "source": "https://www.meetup.com/help/customer/portal/articles/1802998-promotional-materials-for-your-meetup/"
        },
        {
            "title": "Messenger",
@ -888,7 +888,7 @@
        {
            "title": "Microgenetics",
            "hex": "FF0000",
-            "source": ""
+            "source": "http://microgenetics.co.uk/"
        },
        {
            "title": "Microsoft",
@ -928,7 +928,7 @@
        {
            "title": "Minecraft",
            "hex": "62B74A",
-            "source": ""
+            "source": "https://minecraft.net/"
        },
        {
            "title": "Minutemailer",
@ -1133,7 +1133,7 @@
        {
            "title": "Podcasts",
            "hex": "9933CC",
-            "source": ""
+            "source": "https://www.apple.com/itunes/marketing-on-podcasts/identity-guidelines.html#apple-podcasts-icon"
        },
        {
            "title": "Prismic",
@ -1223,7 +1223,7 @@
        {
            "title": "Ruby",
            "hex": "CC342D",
-            "source": ""
+            "source": "https://www.ruby-lang.org/en/about/logo/"
        },
        {
            "title": "Runkeeper",
@ -1243,7 +1243,7 @@
        {
            "title": "Sauce Labs",
            "hex": "E2231A",
-            "source": ""
+            "source": "https://saucelabs.com/"
        },
        {
            "title": "Scribd",
@ -1260,6 +1260,11 @@
            "hex": "21B352",
            "source": "https://sellfy.com/about/"
        },
+        {
+            "title": "Sentia Yoga",
+            "hex": "4CAF50",
+            "source": "http://sentiayoga.com/"
+        },
        {
            "title": "Sentry",
            "hex": "FB4226",
@ -1283,7 +1288,7 @@
        {
            "title": "Simple Icons",
            "hex": "111111",
-            "source": ""
+            "source": "https://simpleicons.org/"
        },
        {
            "title": "Sina Weibo",
@ -1328,7 +1333,7 @@
        {
            "title": "Smashing Magazine",
            "hex": "E85C33",
-            "source": ""
+            "source": "https://www.smashingmagazine.com/"
        },
        {
            "title": "Snapchat",
@ -1363,7 +1368,7 @@
        {
            "title": "Speaker Deck",
            "hex": "339966",
-            "source": ""
+            "source": "https://speakerdeck.com/"
        },
        {
            "title": "Spotify",
@ -1413,7 +1418,7 @@
        {
            "title": "Stitcher",
            "hex": "000000",
-            "source": ""
+            "source": "https://www.stitcher.com/"
        },
        {
            "title": "Storify",
@ -1513,7 +1518,7 @@
        {
            "title": "Topcoder",
            "hex": "29A8E0",
-            "source": ""
+            "source": "http://topcoder.com/"
        },
        {
            "title": "Toptal",
--- a/icons/bitbucket.svg
+++ b/icons/bitbucket.svg
@ -1 +1 @@
-<svg aria-labelledby="simpleicons-bitbucket-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title id="simpleicons-bitbucket-icon">Bitbucket icon</title><path d="M12 0C6.28 0 1.58 1.53 1.58 3.473c0 .51 1.225 7.762 1.736 10.62.204 1.33 3.575 3.165 8.68 3.165s8.375-1.836 8.682-3.164c.51-2.86 1.737-10.11 1.737-10.62C22.315 1.53 17.72 0 12 0zm0 14.91c-1.84 0-3.272-1.43-3.272-3.267 0-1.84 1.432-3.27 3.27-3.27s3.272 1.43 3.272 3.27c0 1.738-1.434 3.267-3.27 3.267zm0-10.416c-3.676 0-6.64-.615-6.64-1.43 0-.816 2.962-1.43 6.64-1.43 3.675 0 6.638.6 6.638 1.424 0 .81-2.962 1.426-6.64 1.426v.01z"/><path d="M19.454 16.852c-.204 0-.308.102-.308.102s-2.55 2.043-7.147 2.043-7.15-2.044-7.15-2.044-.204-.102-.308-.102c-.203 0-.408.104-.408.41v.1c.408 2.147.715 3.678.715 3.885C5.155 22.775 8.22 24 11.895 24c3.675 0 6.74-1.223 7.047-2.756 0-.207.307-1.738.714-3.883v-.1c.103-.204 0-.407-.203-.407z"/><circle cx="11.999" cy="11.542" r="1.634"/></svg>
+<svg aria-labelledby="simpleicons-bitbucket-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title id="simpleicons-bitbucket-icon">Bitbucket icon</title><path d="M.778 1.211c-.424-.006-.772.334-.778.758 0 .045.002.09.01.134l3.263 19.811c.084.499.515.867 1.022.872H19.95c.382.004.708-.271.77-.646l3.27-20.03c.068-.418-.216-.813-.635-.881-.045-.008-.089-.011-.133-.01L.778 1.211zM14.52 15.528H9.522L8.17 8.464h7.561l-1.211 7.064z"/></svg>
--- a/icons/matternet.svg
+++ b/icons/matternet.svg
@ -1 +1 @@
-<svg aria-labelledby="simpleicons-matternet-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title id="simpleicons-matternet-icon">Matternet icon</title><path d="M19.229 4.18l-4.066 2.327V1.826L11.993 0 8.827 1.83v4.677L4.78 4.17 1.606 6v3.664L5.657 12l-4.054 2.343V18l3.165 1.831 4.044-2.338v4.681L11.983 24l3.174-1.831v-4.676l4.052 2.327 3.173-1.829v-3.646L18.339 12l4.058-2.336V6l-3.164-1.82h-.004zm.373 3.429V5.715l1.639.942v1.905l-1.636-.953h-.003zm1.638 9.286l-6.075-3.504 1.65-.945L21.239 15v1.896l.001-.001zm-6.827-3.95L12.763 12l6.452-3.726 1.641.944-6.446 3.727h.003zM3.134 9.219l1.641-.944L11.228 12l-1.639.945-6.455-3.726zm5.69 4.17l-6.075 3.508V15l4.435-2.555 1.641.945v-.001zM2.749 8.564V6.66l1.64-.945v1.898l-1.64.951zm9.627 0V1.55l1.641.937V7.61l-1.641.953v.001zm-2.402-.96V2.493l1.64-.944v7.004l-1.64-.949zm8.866-1.889v1.898l-6.456 3.734V9.442l6.456-3.727zm-7.228 3.724v1.897L5.153 7.609V5.715l6.46 3.721-.001.003zm-2.403 6.513l-4.435 2.555-1.64-.944 6.074-3.508v1.897zm.765-2.343l1.64-.945v7.453l-1.64.959v-7.467zm3.656 8.115l-1.639.954-1.64-.951 1.64-.946 1.639.946v-.003zm.394-.657l-1.648-.95v-7.441l1.648.944v7.458-.011zm6.831-3.504l-1.641.944-4.425-2.555v-1.897l6.075 3.508h-.009z"/></svg
+<svg aria-labelledby="simpleicons-matternet-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title id="simpleicons-matternet-icon">Matternet icon</title><path d="M19.229 4.18l-4.066 2.327V1.826L11.993 0 8.827 1.83v4.677L4.78 4.17 1.606 6v3.664L5.657 12l-4.054 2.343V18l3.165 1.831 4.044-2.338v4.681L11.983 24l3.174-1.831v-4.676l4.052 2.327 3.173-1.829v-3.646L18.339 12l4.058-2.336V6l-3.164-1.82h-.004zm.373 3.429V5.715l1.639.942v1.905l-1.636-.953h-.003zm1.638 9.286l-6.075-3.504 1.65-.945L21.239 15v1.896l.001-.001zm-6.827-3.95L12.763 12l6.452-3.726 1.641.944-6.446 3.727h.003zM3.134 9.219l1.641-.944L11.228 12l-1.639.945-6.455-3.726zm5.69 4.17l-6.075 3.508V15l4.435-2.555 1.641.945v-.001zM2.749 8.564V6.66l1.64-.945v1.898l-1.64.951zm9.627 0V1.55l1.641.937V7.61l-1.641.953v.001zm-2.402-.96V2.493l1.64-.944v7.004l-1.64-.949zm8.866-1.889v1.898l-6.456 3.734V9.442l6.456-3.727zm-7.228 3.724v1.897L5.153 7.609V5.715l6.46 3.721-.001.003zm-2.403 6.513l-4.435 2.555-1.64-.944 6.074-3.508v1.897zm.765-2.343l1.64-.945v7.453l-1.64.959v-7.467zm3.656 8.115l-1.639.954-1.64-.951 1.64-.946 1.639.946v-.003zm.394-.657l-1.648-.95v-7.441l1.648.944v7.458-.011zm6.831-3.504l-1.641.944-4.425-2.555v-1.897l6.075 3.508h-.009z"/></svg>
--- a/package.json
+++ b/package.json
@ -10,5 +10,11 @@
  "main": "_data/simple-icons.json",
  "repository": "git@github.com:danleech/simple-icons.git",
  "author": "Dan Leech",
-  "license": "CCO"
+  "license": "CCO",
+  "devDependencies": {
+    "jsonlint": "^1.6.2"
+  },
+  "scripts": {
+    "jsonlint": "jsonlint _data/simple-icons.json -q -V .jsonlintschema"
+  }
 }