Merge branch 'kriskhoury-master'

devicon-colors.css

@@ -1,10 +1,13 @@
+.devicon-slack-plain-wordmark.colored,
+.devicon-slack-plain.colored {
+	color: #2D333A;
+}
 .devicon-gatling-plain-wordmark.colored {
 	color: #E77500;
 }
 .devicon-gatling-plain.colored {
 	color: #E77500;
 }
-
 .devicon-ssh-original-wordmark.colored,
 .devicon-ssh-plain-wordmark.colored {
 	color: #231F20;

devicon.css

@@ -23,6 +23,12 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.devicon-slack-plain-wordmark:before {
+  content: "\e924";
+}
+.devicon-slack-plain:before {
+  content: "\e925";
+}
 .devicon-facebook-original:before,
 .devicon-facebook-plain:before {
 	content: "\e91c";

devicon.json

@@ -639,6 +639,14 @@
       "font": ["plain", "plain-wordmark"]
     }
   },
+  {
+    "name": "slack",
+    "tags": ["chat"],
+    "versions": {
+      "svg": ["original", "original-wordmark", "plain", "plain-wordmark"],
+      "font": ["plain", "plain-wordmark"]
+    }
+  },
   {
     "name": "sourcetree",
     "tags": ["version-control"],

icons/slack/slack-original-wordmark.svg

@@ -0,0 +1 @@
+<svg id="slack" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><style>.cls-1{fill:#ecb32d;}.cls-2{fill:#63c1a0;}.cls-3{fill:#e01a59;}.cls-4{fill:#331433;}.cls-5{fill:#d62027;}.cls-6{fill:#89d3df;}.cls-7{fill:#258b74;}.cls-8{fill:#819c3c;}.cls-9{fill:#2d333a;}</style></defs><title>Artboard 10</title><g id="original-wordmark"><path class="cls-1" d="M23.69,49.2a3.12,3.12,0,1,0-5.94,1.92l8.07,24.81a3.11,3.11,0,0,0,3.79,1.92A3.06,3.06,0,0,0,31.73,74C31.73,73.95,23.69,49.2,23.69,49.2Z"/><path class="cls-2" d="M11.2,53.24a3.12,3.12,0,1,0-5.94,1.92L13.33,80a3.11,3.11,0,0,0,3.79,1.92,3.06,3.06,0,0,0,2.12-3.85C19.24,78,11.2,53.24,11.2,53.24Z"/><path class="cls-3" d="M33.85,69.72a3.12,3.12,0,1,0-1.92-5.94L7.1,71.88a3.11,3.11,0,0,0-1.92,3.79A3.06,3.06,0,0,0,9,77.79C9.08,77.79,33.85,69.72,33.85,69.72Z"/><path class="cls-4" d="M12.26,76.76l5.94-1.92c-.52-1.61-1.21-3.7-1.92-5.94l-5.94,1.92Z"/><path class="cls-5" d="M24.78,72.68l5.94-1.92c-.52-1.61-1.21-3.7-1.92-5.94l-5.94,1.92Z"/><path class="cls-6" d="M29.78,57.24a3.12,3.12,0,1,0-1.92-5.94L3,59.36a3.11,3.11,0,0,0-1.92,3.79A3.06,3.06,0,0,0,5,65.27C5,65.27,29.78,57.24,29.78,57.24Z"/><path class="cls-7" d="M8.22,64.24l5.94-1.92c-.72-2.24-1.41-4.34-1.92-5.94L6.29,58.3Z"/><path class="cls-8" d="M20.7,60.19l5.94-1.92c-.72-2.24-1.41-4.34-1.92-5.94l-5.94,1.92Z"/><path class="cls-9" d="M59,55.71c1.09.49,1.18.83.32,2.47S58.23,60,57.14,59.53a12.46,12.46,0,0,0-4.22-1c-1.84,0-3,.66-3,1.67,0,3.3,10.51,1.52,10.51,8.53,0,3.53-3,5.89-7.58,5.89a18,18,0,0,1-7.38-1.84c-1-.52-1.09-.8-.2-2.5.75-1.46,1-1.64,2.1-1.18a15.67,15.67,0,0,0,5.4,1.35c1.67,0,2.78-.69,2.78-1.67,0-3.19-10.71-1.67-10.71-8.47,0-3.62,3-6,7.52-6A17.23,17.23,0,0,1,59,55.71Z"/><path class="cls-9" d="M67.5,47.39V73.57a.94.94,0,0,1-1,.8H63.74a.94.94,0,0,1-1-.8V47.39c0-1.29.37-1.41,2.38-1.41C67.42,46,67.5,46.12,67.5,47.39Z"/><path class="cls-9" d="M87.08,62.09V73.37a1,1,0,0,1-1,1H83.35a1,1,0,0,1-1-1.09l0-1.21a7.68,7.68,0,0,1-5.71,2.5c-4.11,0-6.86-2.38-6.86-5.91,0-3.76,3.1-6.32,7.78-6.32a12.41,12.41,0,0,1,4.71.86V61.92c0-2.07-1.64-3.3-4.42-3.3a8.86,8.86,0,0,0-4.16,1.26c-1,.55-1.21.52-2.27-1.06s-1-1.87,0-2.53a13.34,13.34,0,0,1,6.89-2C83.7,54.25,87.08,57.15,87.08,62.09ZM74.39,68.63c0,1.35,1.15,2.24,2.84,2.24a6,6,0,0,0,5.05-2.7V66.42a10.35,10.35,0,0,0-3.62-.66C76.09,65.76,74.39,67,74.39,68.63Z"/><path class="cls-9" d="M105.75,55.74c1,.57,1,.89-.06,2.58s-1.21,1.69-2.33,1.15a8,8,0,0,0-3.27-.8,5.4,5.4,0,0,0-5.74,5.71c0,3.56,2.3,6,5.74,6a8.35,8.35,0,0,0,3.68-1c1-.57,1.21-.55,2.27,1s.95,1.78.09,2.38A11.64,11.64,0,0,1,100,74.61c-6.37,0-10.65-4.08-10.65-10.22s4.28-10.13,10.71-10.13A12.45,12.45,0,0,1,105.75,55.74Z"/><path class="cls-9" d="M126.59,71.91c.8,1,.49,1.38-1.52,2.1s-2.33.69-3-.23l-5.71-7.61-2.56,2.47v4.94a.94.94,0,0,1-1,.8H110a.94.94,0,0,1-1-.8V47.39c0-1.29.37-1.41,2.38-1.41,2.33,0,2.38.17,2.38,1.41V62.26l7.81-7.49c.86-.8,1.35-.75,2.87.26,1.69,1.09,1.81,1.41,1,2.18l-5.8,5.68Z"/></g></svg>

icons/slack/slack-original.svg

@@ -0,0 +1 @@
+<svg id="slack" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><style>.cls-1{fill:#80cade;}.cls-2{fill:#db015c;}.cls-3{fill:#e8a900;}.cls-4{fill:#41b088;}.cls-5{fill:#ca161a;}.cls-6{fill:#3b1d37;}.cls-7{fill:#69852c;}.cls-8{fill:#118f79;}</style></defs><title>Artboard 9</title><g id="original"><path class="cls-1" d="M12.81,67.6a10.2,10.2,0,0,1-9.94-7c-.06-.17-.1-.33-.15-.49A10.69,10.69,0,0,1,9.64,47.07L97,17.8a11.82,11.82,0,0,1,3.19-.47,10.47,10.47,0,0,1,10.21,7.14l.13.42c1.63,5.71-2.43,10.81-7.29,12.44L16.36,67a11.3,11.3,0,0,1-3.55.6Z"/><path class="cls-2" d="M27.37,110.55a10.19,10.19,0,0,1-10-6.89c-.05-.16-.1-.32-.15-.49A10.76,10.76,0,0,1,24.16,90L111.5,60.46a11.24,11.24,0,0,1,3.47-.58A10.55,10.55,0,0,1,125.15,67l.13.44A11.05,11.05,0,0,1,124,76.28c-1.25,1.95-5.19,3.66-5.19,3.66l-87.68,30a12,12,0,0,1-3.71.63Z"/><path class="cls-3" d="M100.08,110.74a10.72,10.72,0,0,1-10.27-7.31L60.66,16.84l-.15-.49A10.74,10.74,0,0,1,81,10l29.15,86.58.08.28a10.73,10.73,0,0,1-10.17,13.89Z"/><path class="cls-4" d="M56.75,125.33A10.73,10.73,0,0,1,46.48,118L17.33,31.43l-.15-.48a10.72,10.72,0,0,1,6.9-13.12,10.89,10.89,0,0,1,3.34-.56,10.72,10.72,0,0,1,10.27,7.31l29.14,86.59c.05.15.1.32.15.48a10.73,10.73,0,0,1-10.23,13.68h0Z"/><path class="cls-5" d="M85.71,91.24,106,84.29,99.39,64.56,79,71.44Z"/><path class="cls-6" d="M42.45,106l20.32-6.95L56.08,79.2,35.73,86.08Z"/><path class="cls-7" d="M71.24,48.26l20.33-6.94L85,21.82,64.64,28.64Z"/><path class="cls-8" d="M28,63,48.3,56.09,41.65,36.34,21.29,43.16,28,63Z"/></g></svg>

icons/slack/slack-plain-wordmark.svg

@@ -0,0 +1 @@
+<svg id="slack" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><style>.cls-1{fill:#2d333a;}</style></defs><title>Artboard 11</title><g id="plain-wordmark"><path class="cls-1" d="M58.17,56.11c1.12.47,1.2.83.33,2.44s-1.12,1.75-2.22,1.32a13,13,0,0,0-4.29-1c-1.87,0-3.11.65-3.11,1.63,0,3.24,10.72,1.49,10.72,8.41,0,3.48-3.09,5.8-7.73,5.8a18.71,18.71,0,0,1-7.53-1.81c-1-.51-1.1-.81-.2-2.46.77-1.45,1-1.61,2.14-1.16a16.18,16.18,0,0,0,5.51,1.32c1.71,0,2.85-.67,2.85-1.65,0-3.14-10.9-1.65-10.9-8.35,0-3.56,3.07-5.94,7.67-5.94A18.71,18.71,0,0,1,58.17,56.11Z"/><path class="cls-1" d="M66.82,47.9V73.68a1,1,0,0,1-1,.81H63a1,1,0,0,1-1-.81V47.9c0-1.28.37-1.4,2.44-1.4C66.74,46.5,66.82,46.66,66.82,47.9Z"/><path class="cls-1" d="M86.78,62.4V73.5a1,1,0,0,1-1,1H83a1,1,0,0,1-1-1.06l0-1.2a8,8,0,0,1-5.82,2.46c-4.19,0-7-2.34-7-5.84,0-3.71,3.17-6.21,7.93-6.23a13.19,13.19,0,0,1,4.8.85V62.2c0-2-1.67-3.26-4.5-3.26a9.41,9.41,0,0,0-4.25,1.24c-1,.55-1.24.51-2.32-1s-1-1.85,0-2.48a13.92,13.92,0,0,1,7-2C83.34,54.66,86.78,57.53,86.78,62.4ZM73.84,68.83c0,1.32,1.16,2.2,2.91,2.2a6.12,6.12,0,0,0,5.15-2.65V66.64a11.18,11.18,0,0,0-3.7-.65C75.59,66,73.84,67.19,73.84,68.83Z"/><path class="cls-1" d="M105.82,56.15c1,.57,1.06.88-.06,2.55s-1.24,1.67-2.36,1.12a8.22,8.22,0,0,0-3.34-.81c-3.52,0-5.86,2.24-5.86,5.62a5.55,5.55,0,0,0,5.86,5.88,8.86,8.86,0,0,0,3.74-1c1-.57,1.24-.53,2.32,1s1,1.75.08,2.34A12.2,12.2,0,0,1,100,74.7c-6.51,0-10.86-4-10.86-10.06s4.35-10,10.9-10A12.73,12.73,0,0,1,105.82,56.15Z"/><path class="cls-1" d="M127.06,72c.81,1,.49,1.36-1.55,2.06s-2.36.69-3.09-.24l-5.82-7.51L114,68.81v4.87a1,1,0,0,1-1,.81h-2.81a1,1,0,0,1-1-.81V47.9c0-1.28.37-1.4,2.44-1.4,2.36,0,2.44.16,2.44,1.4V62.56l8-7.39c.87-.81,1.36-.75,2.93.26,1.73,1.08,1.85,1.38,1,2.16L120,63.17Z"/><polygon class="cls-1" points="15.27 62.75 16.81 67.2 21.6 65.65 20.05 61.21 15.27 62.75"/><polygon class="cls-1" points="15.27 62.75 16.81 67.2 21.6 65.65 20.05 61.21 15.27 62.75"/><path class="cls-1" d="M34.84,59.45c-3.69-11.89-9-14.66-21.33-11.09S-1.66,57.07,2,69s9,14.66,21.33,11.09S38.53,71.34,34.84,59.45Zm-6.22,7.72-2.32.75.8,2.32a1.78,1.78,0,0,1-1.17,2.27,1.91,1.91,0,0,1-.64.09,1.85,1.85,0,0,1-1.71-1.22l-.8-2.32L18,70.6l.8,2.32a1.78,1.78,0,0,1-1.17,2.27,1.91,1.91,0,0,1-.64.09,1.85,1.85,0,0,1-1.71-1.22l-.8-2.32-2.32.75a1.91,1.91,0,0,1-.64.09A1.85,1.85,0,0,1,9.8,71.36,1.78,1.78,0,0,1,11,69.09l2.32-.75-1.54-4.45-2.32.75a1.91,1.91,0,0,1-.64.09,1.85,1.85,0,0,1-1.71-1.22,1.78,1.78,0,0,1,1.17-2.27l2.32-.75-.8-2.32a1.78,1.78,0,0,1,1.17-2.27A1.87,1.87,0,0,1,13.29,57l.8,2.32,4.78-1.55-.8-2.32a1.78,1.78,0,0,1,1.17-2.27,1.87,1.87,0,0,1,2.35,1.13l.8,2.32,2.32-.75A1.87,1.87,0,0,1,27.07,57a1.78,1.78,0,0,1-1.17,2.27l-2.32.75,1.54,4.45,2.32-.75a1.87,1.87,0,0,1,2.35,1.13A1.78,1.78,0,0,1,28.62,67.17Z"/></g></svg>

icons/slack/slack-plain.svg

@@ -0,0 +1 @@
+<svg id="slack" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><defs><style>.cls-1{fill:#2d333a;}</style></defs><title>Artboard 7</title><g id="plain"><polygon class="cls-1" points="53.03 58.97 58.38 74.4 74.97 69.03 69.62 53.6 53.03 58.97"/><polygon class="cls-1" points="53.03 58.97 58.38 74.4 74.97 69.03 69.62 53.6 53.03 58.97"/><path class="cls-1" d="M120.91,47.51C108.1,6.27,89.61-3.35,46.93,9S-5.72,39.26,7.09,80.49s31.3,50.85,74,38.48S133.72,88.74,120.91,47.51ZM99.32,74.27l-8,2.6,2.79,8A6.17,6.17,0,0,1,90,92.8a6.63,6.63,0,0,1-2.21.32,6.42,6.42,0,0,1-5.94-4.24l-2.79-8L62.47,86.2l2.79,8a6.17,6.17,0,0,1-4.06,7.87,6.63,6.63,0,0,1-2.21.32A6.42,6.42,0,0,1,53,98.19l-2.79-8-8,2.6a6.64,6.64,0,0,1-2.21.32,6.42,6.42,0,0,1-5.94-4.24A6.17,6.17,0,0,1,38.12,81l8-2.6L40.82,62.92l-8,2.6a6.63,6.63,0,0,1-2.21.32,6.42,6.42,0,0,1-5.94-4.24,6.17,6.17,0,0,1,4.06-7.87l8-2.6-2.79-8A6.17,6.17,0,0,1,38,35.2a6.49,6.49,0,0,1,8.15,3.92l2.79,8,16.6-5.37-2.79-8a6.17,6.17,0,0,1,4.06-7.87A6.49,6.49,0,0,1,75,29.81l2.79,8,8-2.6a6.49,6.49,0,0,1,8.15,3.92A6.17,6.17,0,0,1,89.88,47l-8,2.6,5.35,15.43,8-2.6a6.49,6.49,0,0,1,8.15,3.92A6.17,6.17,0,0,1,99.32,74.27Z"/></g></svg>