Merge pull request #472 from sylhare/font-awesome

Update Font awesome to v6.7.1
sylhare · Nov 22, 2024 · cb57bd9 · cb57bd9
2 parents 5fdc42b + 156ef19
commit cb57bd9
Show file tree

Hide file tree

Showing 15 changed files with 438 additions and 851 deletions.
diff --git a/_sass/external/_font-awesome.scss b/_sass/external/_font-awesome.scss
@@ -1,5 +1,5 @@
 /*!
- * Type-on-strap Font Awesome kit v6.5.1
+ * Type-on-strap Font Awesome kit v6.7.1
  * Find the version and license of the included Font Awesome here: _sass/external/font-awesome/fontawesome.scss
  */
 $fa-inverse: var(--background);

diff --git a/_sass/external/font-awesome/_animated.scss b/_sass/external/font-awesome/_animated.scss
@@ -150,4 +150,3 @@
   0% { transform: rotate(0deg); }
   100% { transform: rotate(360deg); }
 }
-
diff --git a/_sass/external/font-awesome/_bordered-pulled.scss b/_sass/external/font-awesome/_bordered-pulled.scss
@@ -9,12 +9,12 @@
   padding: var(--#{$fa-css-prefix}-border-padding, #{$fa-border-padding});
 }
 
-.#{$fa-css-prefix}-pull-left { 
+.#{$fa-css-prefix}-pull-left {
   float: left;
   margin-right: var(--#{$fa-css-prefix}-pull-margin, #{$fa-pull-margin}); 
 }
 
-.#{$fa-css-prefix}-pull-right { 
+.#{$fa-css-prefix}-pull-right {
   float: right;
   margin-left: var(--#{$fa-css-prefix}-pull-margin, #{$fa-pull-margin}); 
 }
diff --git a/_sass/external/font-awesome/_core.scss b/_sass/external/font-awesome/_core.scss
@@ -6,15 +6,13 @@
   font-weight: var(--#{$fa-css-prefix}-style, #{$fa-style});
 }
 
-.#{$fa-css-prefix},
-.#{$fa-css-prefix}-classic,
-.#{$fa-css-prefix}-sharp,
 .fas,
-.#{$fa-css-prefix}-solid,
 .far,
-.#{$fa-css-prefix}-regular,
 .fab,
-.#{$fa-css-prefix}-brands {
+.#{$fa-css-prefix}-solid,
+.#{$fa-css-prefix}-regular,
+.#{$fa-css-prefix}-brands,
+.#{$fa-css-prefix} {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   display: var(--#{$fa-css-prefix}-display, #{$fa-display});
@@ -24,20 +22,28 @@
   text-rendering: auto;
 }
 
-.fas,
+.fas::before,
+.far::before,
+.fab::before,
+.#{$fa-css-prefix}-solid::before,
+.#{$fa-css-prefix}-regular::before,
+.#{$fa-css-prefix}-brands::before,
+.fa::before {
+  content: var(#{$fa-icon-property});
+}
+
 .#{$fa-css-prefix}-classic,
+.fas,
 .#{$fa-css-prefix}-solid,
 .far,
 .#{$fa-css-prefix}-regular {
   font-family: 'Font Awesome 6 Free';
 }
-
-.fab,
-.#{$fa-css-prefix}-brands {
+.#{$fa-css-prefix}-brands,
+.fab {
   font-family: 'Font Awesome 6 Brands';
 }
 
-
 %fa-icon {
   @include fa-icon;
 }
diff --git a/_sass/external/font-awesome/_icons.scss b/_sass/external/font-awesome/_icons.scss
@@ -5,6 +5,9 @@
 readers do not read off random characters that represent icons */
 
 @each $name, $icon in $fa-icons {
-  .#{$fa-css-prefix}-#{$name}::before { content: unquote("\"#{ $icon }\""); }
+  .#{$fa-css-prefix}-#{$name} {
+    #{$fa-icon-property}: unquote("\"#{ $icon }\"");
+    #{$fa-duotone-icon-property}: unquote("\"#{$icon}#{$icon}\"");
+  }
 }
 
diff --git a/_sass/external/font-awesome/_list.scss b/_sass/external/font-awesome/_list.scss
@@ -10,7 +10,7 @@
 }
 
 .#{$fa-css-prefix}-li {
-  left: calc(var(--#{$fa-css-prefix}-li-width, #{$fa-li-width}) * -1);
+  left: calc(-1 * var(--#{$fa-css-prefix}-li-width, #{$fa-li-width}));
   position: absolute;
   text-align: center;
   width: var(--#{$fa-css-prefix}-li-width, #{$fa-li-width});

diff --git a/_sass/external/font-awesome/_mixins.scss b/_sass/external/font-awesome/_mixins.scss
@@ -42,34 +42,24 @@
 }
 
 // sets a specific icon family to use alongside style + icon mixins
+@mixin fa-family-classic() {
+  @extend .fa-classic;
+}
 
 // convenience mixins for declaring pseudo-elements by CSS variable,
-// including all style-specific font properties, and both the ::before
-// and ::after elements in the duotone case.
+// including all style-specific font properties
 @mixin fa-icon-solid($fa-var) {
-  @extend %fa-icon;
   @extend .fa-solid;
 
-  &::before {
-    content: unquote("\"#{ $fa-var }\"");
-  }
+  & { #{$fa-icon-property}: unquote("\"#{ $fa-var }\""); #{$fa-duotone-icon-property}: unquote("\"#{ $fa-var }#{ $fa-var }\""); }
 }
-
 @mixin fa-icon-regular($fa-var) {
-  @extend %fa-icon;
   @extend .fa-regular;
 
-  &::before {
-    content: unquote("\"#{ $fa-var }\"");
-  }
+  & { #{$fa-icon-property}: unquote("\"#{ $fa-var }\""); #{$fa-duotone-icon-property}: unquote("\"#{ $fa-var }#{ $fa-var }\""); }
 }
-
 @mixin fa-icon-brands($fa-var) {
-  @extend %fa-icon;
   @extend .fa-brands;
 
-  &::before {
-    content: unquote("\"#{ $fa-var }\"");
-  }
+  & { #{$fa-icon-property}: unquote("\"#{ $fa-var }\""); #{$fa-duotone-icon-property}: unquote("\"#{ $fa-var }#{ $fa-var }\""); }
 }
-
diff --git a/_sass/external/font-awesome/_rotated-flipped.scss b/_sass/external/font-awesome/_rotated-flipped.scss
@@ -22,10 +22,10 @@
 }
 
 .#{$fa-css-prefix}-flip-both,
-.#{$fa-css-prefix}-flip-horizontal.#{$fa-css-prefix}-flip-vertical { 
+.#{$fa-css-prefix}-flip-horizontal.#{$fa-css-prefix}-flip-vertical {
   transform: scale(-1, -1);
 }
 
 .#{$fa-css-prefix}-rotate-by {
-  transform: rotate(var(--#{$fa-css-prefix}-rotate-angle, none));
+  transform: rotate(var(--#{$fa-css-prefix}-rotate-angle, 0));
 }