Adding icons fa-mastodon & fa-mastodon-alt

README.md

@@ -1,7 +1,7 @@
 # [Font Awesome v4.7.0](http://fontawesome.io) [![Changelog #226](https://img.shields.io/badge/changelog-%23226-9E978E.svg)](https://changelog.com/podcast/226)
 ### The iconic font and CSS framework
 
-Font Awesome is a full suite of 675 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 677 pictographic icons for easy scalable vector graphics on websites,
 created and maintained by [Dave Gandy](https://twitter.com/davegandy).
 Stay up to date with the latest release and announcements on Twitter:
 [@fontawesome](https://twitter.com/fontawesome).

css/font-awesome.css

@@ -61,7 +61,7 @@
 }
 .fa-border {
   padding: .2em .25em .15em;
-  border: solid 0.08em #eeeeee;
+  border: solid 0.08em #eee;
   border-radius: .1em;
 }
 .fa-pull-left {
@@ -176,7 +176,7 @@
   font-size: 2em;
 }
 .fa-inverse {
-  color: #ffffff;
+  color: #fff;
 }
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
@@ -2316,6 +2316,12 @@
 .fa-meetup:before {
   content: "\f2e0";
 }
+.fa-mastodon:before {
+  content: "\f2e1";
+}
+.fa-mastodon-alt:before {
+  content: "\f2e2";
+}
 .sr-only {
   position: absolute;
   width: 1px;

fonts/fontawesome-webfont.svg

@@ -2637,10 +2637,14 @@ q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5
 M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
 q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
 q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
-    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+    <glyph glyph-name="mastodon" unicode="&#xf2e1;" horiz-adv-x="1792" d="M1636 462q-6 -32 -26 -64t-50.5 -62t-71 -57.5t-87 -49t-101 -37t-109.5 -22.5q-226 -27 -355 -21q-89 4 -179 16t-135 22l-46 10q0 -30 4 -56q4 -32 14 -59t22.5 -47t32 -36.5t38 -27t45
- />
+-19t47.5 -13t52 -7.5t53 -4t54 -2q46 -2 94.5 1.5t85 9.5t67 12.5t46.5 11.5 l16 5l6 -148l-13 -6.5t-39.5 -15.5t-65 -20t-88.5 -18t-111 -12q-199 -11 -413 45q-58 16 -107 42t-87 59t-69.5 76.5t-54 89.5t-40 102t-28.5 110.5t-18.5 119.5t-11.5 123t-5 126q-1 44 -1
-    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+309q0 62 8.5 119t23 101t34 82.5t40.5 66.5t42 51.5t40 38t34 25t23.5 14.5 l8.5 4q92 43 243.5 64t334.5 22h6q398 -3 578 -86q5 -2 14 -7t35.5 -24.5t50.5 -43.5t53.5 -66.5t51 -91t35.5 -119.5t14 -150q0 -6 0.5 -32t-1.5 -82t-5 -115t-10.5 -130.5t-18.5 -126.5zM1371
- />
+918q0 147 -74 229q-76 85 -199 85q-144 0 -216 -110l-46 -78l-47 78 q-71 110 -215 110q-123 0 -200 -85q-37 -43 -55.5 -100t-18.5 -129v-471h187v457q0 145 122 145q134 0 134 -173v-250h185v250q0 173 135 173q40 0 67.5 -16.5t41 -48.5t13.5 -80v-457h186v471z" />
+    <glyph glyph-name="mastodon-alt" unicode="&#xf2e2;" horiz-adv-x="1792" d="M833 1536h6q183 -1 334.5 -22t243.5 -64q5 -2 14 -7t35.5 -24.5t50.5 -43.5t53.5 -66.5t50.5 -91t35.5 -119.5t14.5 -150q1 -33 0.5 -86t-9.5 -182.5t-26 -217.5q-12 -63 -75 -125.5t-162 -108t-208 -58.5q-227 -27
+-355 -21q-89 4 -179 16t-135 22l-46 10q0 -30 4 -56 q4 -32 14 -59t22.5 -47t32 -36.5t38 -27t45 -19t47.5 -13t52 -7.5t53 -4t54 -2q34 -2 69 0t64 5.5t57 7.5t49 9t37 9l24 6l9 3l6 -148l-13 -6.5t-39.5 -15.5t-65 -20t-88.5 -18t-111 -12q-199 -11 -413 45q-74 20
+-133.5 57.5t-102 85t-75 111.5t-52 129.5t-32.5 147 t-18.5 155.5t-7.5 162q-1 44 -1 309q0 79 14 149.5t36.5 120t49.5 91t54 67t49.5 43t36.5 24.5l14 7q180 83 578 86zM381 917q-52 0 -89 -37t-37 -89t37 -89t89.5 -37t89 37t36.5 89q0 34 -16.5 63t-45.5 46t-64
+17zM836 917q-52 0 -89 -37t-37 -89q0 -34 16.5 -63t46 -46 t63.5 -17q52 0 89 37t37 89t-37 89t-89 37zM1290 917q-25 0 -48.5 -10t-40.5 -27t-27 -40t-10 -49q0 -52 37 -89t89 -37q34 0 63.5 17t46 46t16.5 63q0 52 -37 89t-89 37z" />
     <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792"
  />
     <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792"

less/icons.less

@@ -787,3 +787,5 @@
 .@{fa-css-prefix}-superpowers:before { content: @fa-var-superpowers; }
 .@{fa-css-prefix}-wpexplorer:before { content: @fa-var-wpexplorer; }
 .@{fa-css-prefix}-meetup:before { content: @fa-var-meetup; }
+.@{fa-css-prefix}-mastodon:before { content: @fa-var-mastodon; }
+.@{fa-css-prefix}-mastodon-alt:before { content: @fa-var-mastodon-alt; }

less/variables.less

@@ -454,6 +454,8 @@
 @fa-var-mars-stroke: "\f229";
 @fa-var-mars-stroke-h: "\f22b";
 @fa-var-mars-stroke-v: "\f22a";
+@fa-var-mastodon: "\f2e1";
+@fa-var-mastodon-alt: "\f2e2";
 @fa-var-maxcdn: "\f136";
 @fa-var-meanpath: "\f20c";
 @fa-var-medium: "\f23a";

scss/_icons.scss

@@ -787,3 +787,5 @@
 .#{$fa-css-prefix}-superpowers:before { content: $fa-var-superpowers; }
 .#{$fa-css-prefix}-wpexplorer:before { content: $fa-var-wpexplorer; }
 .#{$fa-css-prefix}-meetup:before { content: $fa-var-meetup; }
+.#{$fa-css-prefix}-mastodon:before { content: $fa-var-mastodon; }
+.#{$fa-css-prefix}-mastodon-alt:before { content: $fa-var-mastodon-alt; }

scss/_variables.scss

@@ -454,6 +454,8 @@ $fa-var-mars-double: "\f227";
 $fa-var-mars-stroke: "\f229";
 $fa-var-mars-stroke-h: "\f22b";
 $fa-var-mars-stroke-v: "\f22a";
+$fa-var-mastodon: "\f2e1";
+$fa-var-mastodon-alt: "\f2e2";
 $fa-var-maxcdn: "\f136";
 $fa-var-meanpath: "\f20c";
 $fa-var-medium: "\f23a";

src/assets/font-awesome/fonts/fontawesome-webfont.svg

@@ -2637,10 +2637,14 @@ q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5
 M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
 q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
 q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
-    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+    <glyph glyph-name="mastodon" unicode="&#xf2e1;" horiz-adv-x="1792" d="M1636 462q-6 -32 -26 -64t-50.5 -62t-71 -57.5t-87 -49t-101 -37t-109.5 -22.5q-226 -27 -355 -21q-89 4 -179 16t-135 22l-46 10q0 -30 4 -56q4 -32 14 -59t22.5 -47t32 -36.5t38 -27t45
- />
+-19t47.5 -13t52 -7.5t53 -4t54 -2q46 -2 94.5 1.5t85 9.5t67 12.5t46.5 11.5 l16 5l6 -148l-13 -6.5t-39.5 -15.5t-65 -20t-88.5 -18t-111 -12q-199 -11 -413 45q-58 16 -107 42t-87 59t-69.5 76.5t-54 89.5t-40 102t-28.5 110.5t-18.5 119.5t-11.5 123t-5 126q-1 44 -1
-    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+309q0 62 8.5 119t23 101t34 82.5t40.5 66.5t42 51.5t40 38t34 25t23.5 14.5 l8.5 4q92 43 243.5 64t334.5 22h6q398 -3 578 -86q5 -2 14 -7t35.5 -24.5t50.5 -43.5t53.5 -66.5t51 -91t35.5 -119.5t14 -150q0 -6 0.5 -32t-1.5 -82t-5 -115t-10.5 -130.5t-18.5 -126.5zM1371
- />
+918q0 147 -74 229q-76 85 -199 85q-144 0 -216 -110l-46 -78l-47 78 q-71 110 -215 110q-123 0 -200 -85q-37 -43 -55.5 -100t-18.5 -129v-471h187v457q0 145 122 145q134 0 134 -173v-250h185v250q0 173 135 173q40 0 67.5 -16.5t41 -48.5t13.5 -80v-457h186v471z" />
+    <glyph glyph-name="mastodon-alt" unicode="&#xf2e2;" horiz-adv-x="1792" d="M833 1536h6q183 -1 334.5 -22t243.5 -64q5 -2 14 -7t35.5 -24.5t50.5 -43.5t53.5 -66.5t50.5 -91t35.5 -119.5t14.5 -150q1 -33 0.5 -86t-9.5 -182.5t-26 -217.5q-12 -63 -75 -125.5t-162 -108t-208 -58.5q-227 -27
+-355 -21q-89 4 -179 16t-135 22l-46 10q0 -30 4 -56 q4 -32 14 -59t22.5 -47t32 -36.5t38 -27t45 -19t47.5 -13t52 -7.5t53 -4t54 -2q34 -2 69 0t64 5.5t57 7.5t49 9t37 9l24 6l9 3l6 -148l-13 -6.5t-39.5 -15.5t-65 -20t-88.5 -18t-111 -12q-199 -11 -413 45q-74 20
+-133.5 57.5t-102 85t-75 111.5t-52 129.5t-32.5 147 t-18.5 155.5t-7.5 162q-1 44 -1 309q0 79 14 149.5t36.5 120t49.5 91t54 67t49.5 43t36.5 24.5l14 7q180 83 578 86zM381 917q-52 0 -89 -37t-37 -89t37 -89t89.5 -37t89 37t36.5 89q0 34 -16.5 63t-45.5 46t-64
+17zM836 917q-52 0 -89 -37t-37 -89q0 -34 16.5 -63t46 -46 t63.5 -17q52 0 89 37t37 89t-37 89t-89 37zM1290 917q-25 0 -48.5 -10t-40.5 -27t-27 -40t-10 -49q0 -52 37 -89t89 -37q34 0 63.5 17t46 46t16.5 63q0 52 -37 89t-89 37z" />
     <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792"
  />
     <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792"

src/icons.yml

@@ -6576,3 +6576,27 @@ icons:
     created:    4.7
     categories:
       - Brand Icons
+
+  - name:       Mastodon
+    id:         mastodon
+    unicode:    f2e1
+    created:    5.0
+    url:        joinmastodon.org
+    filter:
+      - toot
+      - social network
+    categories:
+      - Web Application Icons
+      - Brand Icons
+
+  - name:       Mastodon Alt
+    id:         mastodon-alt
+    unicode:    f2e2
+    created:    5.0
+    url:        joinmastodon.org
+    filter:
+      - toot
+      - social network
+    categories:
+      - Web Application Icons
+      - Brand Icons