Skip to content

Commit

Permalink
Update FontAwesome to 6.7.1. (#943)
Browse files Browse the repository at this point in the history
### Prerequisites

Put an `x` into the box(es) that apply:

- [x] This pull request fixes a bug.
- [x] This pull request adds a feature.
- [ ] This pull request introduces breaking change.

### Description

https://fontawesome.com/changelog

See changelogs for 6.7.0 and 6.7.1.

This includes additional icons and tweaks for the formatting of some
existing icons. These files are directly unpacked, without any
modification, from the published free ZIP file on the FA github and on
FA's own website.

### Issues Resolved

N/A

### Checklist

Put an `x` into the box(es) that apply:

#### General

- [x] Describe what changes are being made
- [x] Explain why and how the changes were necessary and implemented
respectively
- [ ] Reference issue with `#<ISSUE_NO>` if applicable

#### Resources

- [x] If you have changed any SCSS code, run `make release` to
regenerate all CSS files

#### Contributors

- [ ] Add yourself to `CONTRIBUTORS.md` if you aren't on it already

Co-authored-by: Luiz F. A. de Prá <[email protected]>
  • Loading branch information
simonhollingshead and luizdepra authored Dec 1, 2024
1 parent a47ff10 commit a7d9dce
Show file tree
Hide file tree
Showing 22 changed files with 403 additions and 392 deletions.
26 changes: 16 additions & 10 deletions assets/scss/font-awesome/_core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
font-weight: var(--#{$fa-css-prefix}-style, #{$fa-style});
}

.#{$fa-css-prefix}-solid,
.#{$fa-css-prefix}-regular,
.#{$fa-css-prefix}-brands,
.fas,
.far,
.fab,
.#{$fa-css-prefix}-sharp-solid,
.#{$fa-css-prefix}-classic,
.#{$fa-css-prefix}-solid,
.#{$fa-css-prefix}-regular,
.#{$fa-css-prefix}-brands,
.#{$fa-css-prefix} {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand All @@ -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;
}
5 changes: 4 additions & 1 deletion assets/scss/font-awesome/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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}\"");
}
}

21 changes: 7 additions & 14 deletions assets/scss/font-awesome/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +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 }\""); }
}
612 changes: 306 additions & 306 deletions assets/scss/font-awesome/_shims.scss

Large diffs are not rendered by default.

91 changes: 57 additions & 34 deletions assets/scss/font-awesome/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,52 +1,55 @@
// variables
// --------------------------

$fa-css-prefix : fa !default;
$fa-style : 900 !default;
$fa-style-family : "Font Awesome 6 Free" !default;
$fa-css-prefix : fa !default;
$fa-style : 900 !default;
$fa-style-family : "Font Awesome 6 Free" !default;

$fa-display : inline-block !default;
$fa-icon-property : --fa;
$fa-duotone-icon-property : --fa--fa;

$fa-fw-width : fa-divide(20em, 16) !default;
$fa-inverse : #fff !default;
$fa-display : inline-block !default;

$fa-border-color : #eee !default;
$fa-border-padding : .2em .25em .15em !default;
$fa-border-radius : .1em !default;
$fa-border-style : solid !default;
$fa-border-width : .08em !default;
$fa-fw-width : fa-divide(20em, 16) !default;
$fa-inverse : #fff !default;

$fa-size-scale-2xs : 10 !default;
$fa-size-scale-xs : 12 !default;
$fa-size-scale-sm : 14 !default;
$fa-size-scale-base : 16 !default;
$fa-size-scale-lg : 20 !default;
$fa-size-scale-xl : 24 !default;
$fa-size-scale-2xl : 32 !default;
$fa-border-color : #eee !default;
$fa-border-padding : .2em .25em .15em !default;
$fa-border-radius : .1em !default;
$fa-border-style : solid !default;
$fa-border-width : .08em !default;

$fa-size-scale-2xs : 10 !default;
$fa-size-scale-xs : 12 !default;
$fa-size-scale-sm : 14 !default;
$fa-size-scale-base : 16 !default;
$fa-size-scale-lg : 20 !default;
$fa-size-scale-xl : 24 !default;
$fa-size-scale-2xl : 32 !default;

$fa-sizes: (
"2xs" : $fa-size-scale-2xs,
"xs" : $fa-size-scale-xs,
"sm" : $fa-size-scale-sm,
"lg" : $fa-size-scale-lg,
"xl" : $fa-size-scale-xl,
"2xl" : $fa-size-scale-2xl
"2xs" : $fa-size-scale-2xs,
"xs" : $fa-size-scale-xs,
"sm" : $fa-size-scale-sm,
"lg" : $fa-size-scale-lg,
"xl" : $fa-size-scale-xl,
"2xl" : $fa-size-scale-2xl
) !default;

$fa-li-width : 2em !default;
$fa-li-margin : $fa-li-width * fa-divide(5, 4) !default;
$fa-li-width : 2em !default;
$fa-li-margin : $fa-li-width * fa-divide(5, 4) !default;

$fa-pull-margin : .3em !default;
$fa-pull-margin : .3em !default;

$fa-primary-opacity : 1 !default;
$fa-secondary-opacity : .4 !default;
$fa-primary-opacity : 1 !default;
$fa-secondary-opacity : .4 !default;

$fa-stack-vertical-align: middle !default;
$fa-stack-width : ($fa-fw-width * 2) !default;
$fa-stack-z-index : auto !default;
$fa-stack-vertical-align : middle !default;
$fa-stack-width : ($fa-fw-width * 2) !default;
$fa-stack-z-index : auto !default;

$fa-font-display : block !default;
$fa-font-path : "../webfonts" !default;
$fa-font-display : block !default;
$fa-font-path : "../webfonts" !default;

$fa-var-0: \30;
$fa-var-1: \31;
Expand Down Expand Up @@ -636,6 +639,7 @@ $fa-var-square-nfi: \e576;
$fa-var-arrow-up-from-ground-water: \e4b5;
$fa-var-martini-glass: \f57b;
$fa-var-glass-martini-alt: \f57b;
$fa-var-square-binary: \e69b;
$fa-var-rotate-left: \f2ea;
$fa-var-rotate-back: \f2ea;
$fa-var-rotate-backward: \f2ea;
Expand Down Expand Up @@ -1055,6 +1059,7 @@ $fa-var-face-grin-squint: \f585;
$fa-var-grin-squint: \f585;
$fa-var-hand-holding-dollar: \f4c0;
$fa-var-hand-holding-usd: \f4c0;
$fa-var-chart-diagram: \e695;
$fa-var-bacterium: \e05a;
$fa-var-hand-pointer: \f25a;
$fa-var-drum-steelpan: \f56a;
Expand Down Expand Up @@ -1087,6 +1092,7 @@ $fa-var-door-closed: \f52a;
$fa-var-shield-virus: \e06c;
$fa-var-dice-six: \f526;
$fa-var-mosquito-net: \e52c;
$fa-var-file-fragment: \e697;
$fa-var-bridge-water: \e4ce;
$fa-var-person-booth: \f756;
$fa-var-text-width: \f035;
Expand Down Expand Up @@ -1268,6 +1274,7 @@ $fa-var-vials: \f493;
$fa-var-plug-circle-plus: \e55f;
$fa-var-place-of-worship: \f67f;
$fa-var-grip-vertical: \f58e;
$fa-var-hexagon-nodes: \e699;
$fa-var-arrow-turn-up: \f148;
$fa-var-level-up: \f148;
$fa-var-u: \55;
Expand Down Expand Up @@ -1657,6 +1664,7 @@ $fa-var-rocket: \f135;
$fa-var-photo-film: \f87c;
$fa-var-photo-video: \f87c;
$fa-var-folder-minus: \f65d;
$fa-var-hexagon-nodes-bolt: \e69a;
$fa-var-store: \f54e;
$fa-var-arrow-trend-up: \e098;
$fa-var-plug-circle-minus: \e55e;
Expand Down Expand Up @@ -1744,6 +1752,7 @@ $fa-var-shield: \f132;
$fa-var-shield-blank: \f132;
$fa-var-arrow-up-short-wide: \f885;
$fa-var-sort-amount-up-alt: \f885;
$fa-var-comment-nodes: \e696;
$fa-var-house-medical: \e3b2;
$fa-var-golf-ball-tee: \f450;
$fa-var-golf-ball: \f450;
Expand Down Expand Up @@ -1934,6 +1943,7 @@ $fa-var-window-minimize: \f2d1;
$fa-var-mug-saucer: \f0f4;
$fa-var-coffee: \f0f4;
$fa-var-brush: \f55d;
$fa-var-file-half-dashed: \e698;
$fa-var-mask: \f6fa;
$fa-var-magnifying-glass-minus: \f010;
$fa-var-search-minus: \f010;
Expand Down Expand Up @@ -2124,6 +2134,7 @@ $fa-var-scribd: \f28a;
$fa-var-debian: \e60b;
$fa-var-openid: \f19b;
$fa-var-instalod: \e081;
$fa-var-files-pinwheel: \e69f;
$fa-var-expeditedssl: \f23e;
$fa-var-sellcast: \f2da;
$fa-var-square-twitter: \f081;
Expand Down Expand Up @@ -2165,6 +2176,7 @@ $fa-var-square-letterboxd: \e62e;
$fa-var-sticker-mule: \f3f7;
$fa-var-creative-commons-zero: \f4f3;
$fa-var-hips: \f452;
$fa-var-css: \e6a2;
$fa-var-behance: \f1b4;
$fa-var-reddit: \f1a1;
$fa-var-discord: \f392;
Expand Down Expand Up @@ -2308,6 +2320,7 @@ $fa-var-magento: \f3c4;
$fa-var-spotify: \f1bc;
$fa-var-optin-monster: \f23c;
$fa-var-fly: \f417;
$fa-var-square-bluesky: \e6a3;
$fa-var-aviato: \f421;
$fa-var-itunes: \f3b4;
$fa-var-cuttlefish: \f38c;
Expand Down Expand Up @@ -3121,6 +3134,7 @@ $fa-icons: (
"arrow-up-from-ground-water": $fa-var-arrow-up-from-ground-water,
"martini-glass": $fa-var-martini-glass,
"glass-martini-alt": $fa-var-glass-martini-alt,
"square-binary": $fa-var-square-binary,
"rotate-left": $fa-var-rotate-left,
"rotate-back": $fa-var-rotate-back,
"rotate-backward": $fa-var-rotate-backward,
Expand Down Expand Up @@ -3540,6 +3554,7 @@ $fa-icons: (
"grin-squint": $fa-var-grin-squint,
"hand-holding-dollar": $fa-var-hand-holding-dollar,
"hand-holding-usd": $fa-var-hand-holding-usd,
"chart-diagram": $fa-var-chart-diagram,
"bacterium": $fa-var-bacterium,
"hand-pointer": $fa-var-hand-pointer,
"drum-steelpan": $fa-var-drum-steelpan,
Expand Down Expand Up @@ -3572,6 +3587,7 @@ $fa-icons: (
"shield-virus": $fa-var-shield-virus,
"dice-six": $fa-var-dice-six,
"mosquito-net": $fa-var-mosquito-net,
"file-fragment": $fa-var-file-fragment,
"bridge-water": $fa-var-bridge-water,
"person-booth": $fa-var-person-booth,
"text-width": $fa-var-text-width,
Expand Down Expand Up @@ -3753,6 +3769,7 @@ $fa-icons: (
"plug-circle-plus": $fa-var-plug-circle-plus,
"place-of-worship": $fa-var-place-of-worship,
"grip-vertical": $fa-var-grip-vertical,
"hexagon-nodes": $fa-var-hexagon-nodes,
"arrow-turn-up": $fa-var-arrow-turn-up,
"level-up": $fa-var-level-up,
"u": $fa-var-u,
Expand Down Expand Up @@ -4142,6 +4159,7 @@ $fa-icons: (
"photo-film": $fa-var-photo-film,
"photo-video": $fa-var-photo-video,
"folder-minus": $fa-var-folder-minus,
"hexagon-nodes-bolt": $fa-var-hexagon-nodes-bolt,
"store": $fa-var-store,
"arrow-trend-up": $fa-var-arrow-trend-up,
"plug-circle-minus": $fa-var-plug-circle-minus,
Expand Down Expand Up @@ -4229,6 +4247,7 @@ $fa-icons: (
"shield-blank": $fa-var-shield-blank,
"arrow-up-short-wide": $fa-var-arrow-up-short-wide,
"sort-amount-up-alt": $fa-var-sort-amount-up-alt,
"comment-nodes": $fa-var-comment-nodes,
"house-medical": $fa-var-house-medical,
"golf-ball-tee": $fa-var-golf-ball-tee,
"golf-ball": $fa-var-golf-ball,
Expand Down Expand Up @@ -4419,6 +4438,7 @@ $fa-icons: (
"mug-saucer": $fa-var-mug-saucer,
"coffee": $fa-var-coffee,
"brush": $fa-var-brush,
"file-half-dashed": $fa-var-file-half-dashed,
"mask": $fa-var-mask,
"magnifying-glass-minus": $fa-var-magnifying-glass-minus,
"search-minus": $fa-var-search-minus,
Expand Down Expand Up @@ -4611,6 +4631,7 @@ $fa-brand-icons: (
"debian": $fa-var-debian,
"openid": $fa-var-openid,
"instalod": $fa-var-instalod,
"files-pinwheel": $fa-var-files-pinwheel,
"expeditedssl": $fa-var-expeditedssl,
"sellcast": $fa-var-sellcast,
"square-twitter": $fa-var-square-twitter,
Expand Down Expand Up @@ -4652,6 +4673,7 @@ $fa-brand-icons: (
"sticker-mule": $fa-var-sticker-mule,
"creative-commons-zero": $fa-var-creative-commons-zero,
"hips": $fa-var-hips,
"css": $fa-var-css,
"behance": $fa-var-behance,
"reddit": $fa-var-reddit,
"discord": $fa-var-discord,
Expand Down Expand Up @@ -4795,6 +4817,7 @@ $fa-brand-icons: (
"spotify": $fa-var-spotify,
"optin-monster": $fa-var-optin-monster,
"fly": $fa-var-fly,
"square-bluesky": $fa-var-square-bluesky,
"aviato": $fa-var-aviato,
"itunes": $fa-var-itunes,
"cuttlefish": $fa-var-cuttlefish,
Expand Down
4 changes: 2 additions & 2 deletions assets/scss/font-awesome/brands.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.7.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2024 Fonticons, Inc.
*/
Expand All @@ -26,5 +26,5 @@
}

@each $name, $icon in $fa-brand-icons {
.#{$fa-css-prefix}-#{$name}:before { content: unquote("\"#{ $icon }\""); }
.#{$fa-css-prefix}-#{$name} { #{$fa-icon-property}: unquote("\"#{ $icon }\""); }
}
2 changes: 1 addition & 1 deletion assets/scss/font-awesome/fontawesome.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.7.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2024 Fonticons, Inc.
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/font-awesome/regular.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.7.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2024 Fonticons, Inc.
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/font-awesome/solid.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.7.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2024 Fonticons, Inc.
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/font-awesome/v4-shims.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.7.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2024 Fonticons, Inc.
*/
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a7d9dce

Please sign in to comment.