Skip to content

Commit

Permalink
Update Font Awesome from 6.5.1 to 6.5.2. (#901)
Browse files Browse the repository at this point in the history
### Prerequisites

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

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

### Description

This PR updates the version of Font Awesome used within the project from
6.5.1 Free to 6.5.2 Free. This adds additional characters.

The files are directly copied out of the published archive file with no
alterations.

Please note that the CSS regeneration also seems to have pulled in the
mastodon SCSS originally added in #885 - it looks like nobody
regenerated the CSS during that PR. For what it's worth, a while back I
did make a comment #864 about the fact that I have fully automated the
CSS regeneration for my own branch using a Github action. You may want
to consider it too (by which I mean 'tell me if you want it contributed
back').

### Issues Resolved

None

### 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

- [x] Add yourself to `CONTRIBUTORS.md` if you aren't on it already
  • Loading branch information
simonhollingshead committed Apr 8, 2024
1 parent 0078e66 commit 33fd0ab
Show file tree
Hide file tree
Showing 22 changed files with 134 additions and 504 deletions.
4 changes: 2 additions & 2 deletions assets/scss/font-awesome/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ as SVG and JS file types.
In the Font Awesome Free download, the SIL OFL license applies to all icons
packaged as web and desktop font files.

Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
Copyright (c) 2024 Fonticons, Inc. (https://fontawesome.com)
with Reserved Font Name: "Font Awesome".

This Font Software is licensed under the SIL Open Font License, Version 1.1.
Expand Down Expand Up @@ -123,7 +123,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
In the Font Awesome Free download, the MIT license applies to all non-font and
non-icon files.

Copyright 2023 Fonticons, Inc.
Copyright 2024 Fonticons, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in the
Expand Down
1 change: 0 additions & 1 deletion assets/scss/font-awesome/_animated.scss
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,3 @@
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}

4 changes: 2 additions & 2 deletions assets/scss/font-awesome/_bordered-pulled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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});
}
3 changes: 0 additions & 3 deletions assets/scss/font-awesome/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
content: unquote("\"#{ $fa-var }\"");
}
}

@mixin fa-icon-regular($fa-var) {
@extend %fa-icon;
@extend .fa-regular;
Expand All @@ -63,7 +62,6 @@
content: unquote("\"#{ $fa-var }\"");
}
}

@mixin fa-icon-brands($fa-var) {
@extend %fa-icon;
@extend .fa-brands;
Expand All @@ -72,4 +70,3 @@
content: unquote("\"#{ $fa-var }\"");
}
}

4 changes: 2 additions & 2 deletions assets/scss/font-awesome/_rotated-flipped.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Loading

0 comments on commit 33fd0ab

Please sign in to comment.