Merge pull request #186 from FortAwesome/5.10.2-wip

Font Awesome Free 5.10.2
FortAwesome · Sep 19, 2019 · b555995 · b555995
2 parents 8f5c2f7 + a4d36bf
commit b555995
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Please see the appropriate guide for your environment of choice:
 In your Gemfile include:
 
 ```ruby
-gem 'font-awesome-sass', '~> 5.9.0'
+gem 'font-awesome-sass', '~> 5.10.2'
 ```
 
 And then execute:

diff --git a/assets/fonts/font-awesome/fa-brands-400.eot b/assets/fonts/font-awesome/fa-brands-400.eot
diff --git a/assets/fonts/font-awesome/fa-brands-400.svg b/assets/fonts/font-awesome/fa-brands-400.svg
diff --git a/assets/fonts/font-awesome/fa-brands-400.ttf b/assets/fonts/font-awesome/fa-brands-400.ttf
diff --git a/assets/fonts/font-awesome/fa-brands-400.woff b/assets/fonts/font-awesome/fa-brands-400.woff
diff --git a/assets/fonts/font-awesome/fa-brands-400.woff2 b/assets/fonts/font-awesome/fa-brands-400.woff2
diff --git a/assets/fonts/font-awesome/fa-regular-400.eot b/assets/fonts/font-awesome/fa-regular-400.eot
diff --git a/assets/fonts/font-awesome/fa-regular-400.svg b/assets/fonts/font-awesome/fa-regular-400.svg
diff --git a/assets/fonts/font-awesome/fa-regular-400.ttf b/assets/fonts/font-awesome/fa-regular-400.ttf
diff --git a/assets/fonts/font-awesome/fa-regular-400.woff b/assets/fonts/font-awesome/fa-regular-400.woff
diff --git a/assets/fonts/font-awesome/fa-regular-400.woff2 b/assets/fonts/font-awesome/fa-regular-400.woff2
diff --git a/assets/fonts/font-awesome/fa-solid-900.eot b/assets/fonts/font-awesome/fa-solid-900.eot
diff --git a/assets/fonts/font-awesome/fa-solid-900.svg b/assets/fonts/font-awesome/fa-solid-900.svg
diff --git a/assets/fonts/font-awesome/fa-solid-900.ttf b/assets/fonts/font-awesome/fa-solid-900.ttf
diff --git a/assets/fonts/font-awesome/fa-solid-900.woff b/assets/fonts/font-awesome/fa-solid-900.woff
diff --git a/assets/fonts/font-awesome/fa-solid-900.woff2 b/assets/fonts/font-awesome/fa-solid-900.woff2
diff --git a/assets/stylesheets/_font-awesome.scss b/assets/stylesheets/_font-awesome.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 @import "font-awesome/variables";

diff --git a/assets/stylesheets/_v4-shims.scss b/assets/stylesheets/_v4-shims.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
  @import "font-awesome/variables";

diff --git a/assets/stylesheets/font-awesome/_core.scss b/assets/stylesheets/font-awesome/_core.scss
@@ -5,6 +5,7 @@
 .fas,
 .far,
 .fal,
+.fad,
 .fab {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;

diff --git a/assets/stylesheets/font-awesome/_icons.scss b/assets/stylesheets/font-awesome/_icons.scss
@@ -301,6 +301,7 @@ readers do not read off random characters that represent icons */
 .#{$fa-css-prefix}-cookie-bite:before { content: fa-content($fa-var-cookie-bite); }
 .#{$fa-css-prefix}-copy:before { content: fa-content($fa-var-copy); }
 .#{$fa-css-prefix}-copyright:before { content: fa-content($fa-var-copyright); }
+.#{$fa-css-prefix}-cotton-bureau:before { content: fa-content($fa-var-cotton-bureau); }
 .#{$fa-css-prefix}-couch:before { content: fa-content($fa-var-couch); }
 .#{$fa-css-prefix}-cpanel:before { content: fa-content($fa-var-cpanel); }
 .#{$fa-css-prefix}-creative-commons:before { content: fa-content($fa-var-creative-commons); }

diff --git a/assets/stylesheets/font-awesome/_shims.scss b/assets/stylesheets/font-awesome/_shims.scss
@@ -626,15 +626,15 @@
 
 .#{$fa-css-prefix}.#{$fa-css-prefix}-sort-alpha-asc:before { content: fa-content($fa-var-sort-alpha-down); }
 
-.#{$fa-css-prefix}.#{$fa-css-prefix}-sort-alpha-desc:before { content: fa-content($fa-var-sort-alpha-up); }
+.#{$fa-css-prefix}.#{$fa-css-prefix}-sort-alpha-desc:before { content: fa-content($fa-var-sort-alpha-down-alt); }
 
 .#{$fa-css-prefix}.#{$fa-css-prefix}-sort-amount-asc:before { content: fa-content($fa-var-sort-amount-down); }
 
-.#{$fa-css-prefix}.#{$fa-css-prefix}-sort-amount-desc:before { content: fa-content($fa-var-sort-amount-up); }
+.#{$fa-css-prefix}.#{$fa-css-prefix}-sort-amount-desc:before { content: fa-content($fa-var-sort-amount-down-alt); }
 
 .#{$fa-css-prefix}.#{$fa-css-prefix}-sort-numeric-asc:before { content: fa-content($fa-var-sort-numeric-down); }
 
-.#{$fa-css-prefix}.#{$fa-css-prefix}-sort-numeric-desc:before { content: fa-content($fa-var-sort-numeric-up); }
+.#{$fa-css-prefix}.#{$fa-css-prefix}-sort-numeric-desc:before { content: fa-content($fa-var-sort-numeric-down-alt); }
 
 .#{$fa-css-prefix}.#{$fa-css-prefix}-youtube-square {
   font-family: 'Font Awesome 5 Brands';
@@ -2059,3 +2059,4 @@
   font-family: 'Font Awesome 5 Brands';
   font-weight: 400;
 }
+
diff --git a/assets/stylesheets/font-awesome/_variables.scss b/assets/stylesheets/font-awesome/_variables.scss
@@ -5,14 +5,16 @@ $fa-sass-asset-helper: false !default;
 
 $fa-font-path: if($fa-sass-asset-helper, "font-awesome", "../fonts/font-awesome") !default;
 
-$fa-font-size-base:           16px !default;
-$fa-font-display:             auto !default;
-$fa-css-prefix:               fa !default;
-$fa-version:                  "5.9.0" !default;
-$fa-border-color:             #eee !default;
-$fa-inverse:                  #fff !default;
-$fa-li-width:                 2em !default;
-$fa-fw-width:                 (20em / 16);
+$fa-font-size-base:    16px !default;
+$fa-font-display:      auto !default;
+$fa-css-prefix:        fa !default;
+$fa-version:           "5.10.2" !default;
+$fa-border-color:      #eee !default;
+$fa-inverse:           #fff !default;
+$fa-li-width:          2em !default;
+$fa-fw-width:          (20em / 16);
+$fa-primary-opacity:   1 !default;
+$fa-secondary-opacity: .4 !default;
 
 // Convenience function used to set content property
 @function fa-content($fa-var) {
@@ -319,6 +321,7 @@ $fa-var-cookie: \f563;
 $fa-var-cookie-bite: \f564;
 $fa-var-copy: \f0c5;
 $fa-var-copyright: \f1f9;
+$fa-var-cotton-bureau: \f89e;
 $fa-var-couch: \f4b8;
 $fa-var-cpanel: \f388;
 $fa-var-creative-commons: \f25e;

diff --git a/lib/font_awesome/sass/version.rb b/lib/font_awesome/sass/version.rb
@@ -1,5 +1,5 @@
 module FontAwesome
   module Sass
-    VERSION = '5.9.0'.freeze
+    VERSION = '5.10.2'.freeze
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     .fas,
     .far,
     .fal,
+    .fad,
     .fab {
       -moz-osx-font-smoothing: grayscale;
       -webkit-font-smoothing: antialiased;
@@ Expand Down @@