Skip to content

Commit 4211915

Browse files
committed
Update to font fontawesome v6.4.2
Move CSS to font folder to keep all fontwawesome files and dependencies in one place. Makes updates easier.
1 parent ea46ea2 commit 4211915

16 files changed

+202
-13
lines changed

_includes/head.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<meta property="og:image" content="{{ image }}">
4747
<meta property="og:description" content="{{ description }}">
4848
<meta property="og:site_name" content="{{ site.title }}">
49-
49+
5050
<!-- Favicon -->
5151
<link rel="apple-touch-icon" sizes="180x180" href="/assets/branding/favicons/apple-touch-icon.png?v=2">
5252
<link rel="icon" type="image/png" sizes="32x32" href="/assets/branding/favicons/favicon-32x32.png?v=2">
@@ -60,7 +60,7 @@
6060

6161
<!-- Resources -->
6262
<link rel="stylesheet" href="/assets/css/main.css">
63-
<link rel="stylesheet" href="/assets/css/all.css">
63+
<link rel="stylesheet" href="/assets/fonts/fontawesome/css/all.min.css">
6464
<script src="/assets/js/jquery.min.js"></script>
6565
<script src="/assets/js/bootstrap.bundle.min.js"></script>
6666
<script defer src="/assets/js/search.min.js"></script>

assets/fonts/fontawesome/LICENSE.txt

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
Fonticons, Inc. (https://fontawesome.com)
2+
3+
--------------------------------------------------------------------------------
4+
5+
Font Awesome Free License
6+
7+
Font Awesome Free is free, open source, and GPL friendly. You can use it for
8+
commercial projects, open source projects, or really almost whatever you want.
9+
Full Font Awesome Free license: https://fontawesome.com/license/free.
10+
11+
--------------------------------------------------------------------------------
12+
13+
# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
14+
15+
The Font Awesome Free download is licensed under a Creative Commons
16+
Attribution 4.0 International License and applies to all icons packaged
17+
as SVG and JS file types.
18+
19+
--------------------------------------------------------------------------------
20+
21+
# Fonts: SIL OFL 1.1 License
22+
23+
In the Font Awesome Free download, the SIL OFL license applies to all icons
24+
packaged as web and desktop font files.
25+
26+
Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
27+
with Reserved Font Name: "Font Awesome".
28+
29+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
30+
This license is copied below, and is also available with a FAQ at:
31+
http://scripts.sil.org/OFL
32+
33+
SIL OPEN FONT LICENSE
34+
Version 1.1 - 26 February 2007
35+
36+
PREAMBLE
37+
The goals of the Open Font License (OFL) are to stimulate worldwide
38+
development of collaborative font projects, to support the font creation
39+
efforts of academic and linguistic communities, and to provide a free and
40+
open framework in which fonts may be shared and improved in partnership
41+
with others.
42+
43+
The OFL allows the licensed fonts to be used, studied, modified and
44+
redistributed freely as long as they are not sold by themselves. The
45+
fonts, including any derivative works, can be bundled, embedded,
46+
redistributed and/or sold with any software provided that any reserved
47+
names are not used by derivative works. The fonts and derivatives,
48+
however, cannot be released under any other type of license. The
49+
requirement for fonts to remain under this license does not apply
50+
to any document created using the fonts or their derivatives.
51+
52+
DEFINITIONS
53+
"Font Software" refers to the set of files released by the Copyright
54+
Holder(s) under this license and clearly marked as such. This may
55+
include source files, build scripts and documentation.
56+
57+
"Reserved Font Name" refers to any names specified as such after the
58+
copyright statement(s).
59+
60+
"Original Version" refers to the collection of Font Software components as
61+
distributed by the Copyright Holder(s).
62+
63+
"Modified Version" refers to any derivative made by adding to, deleting,
64+
or substituting — in part or in whole — any of the components of the
65+
Original Version, by changing formats or by porting the Font Software to a
66+
new environment.
67+
68+
"Author" refers to any designer, engineer, programmer, technical
69+
writer or other person who contributed to the Font Software.
70+
71+
PERMISSION & CONDITIONS
72+
Permission is hereby granted, free of charge, to any person obtaining
73+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
74+
redistribute, and sell modified and unmodified copies of the Font
75+
Software, subject to the following conditions:
76+
77+
1) Neither the Font Software nor any of its individual components,
78+
in Original or Modified Versions, may be sold by itself.
79+
80+
2) Original or Modified Versions of the Font Software may be bundled,
81+
redistributed and/or sold with any software, provided that each copy
82+
contains the above copyright notice and this license. These can be
83+
included either as stand-alone text files, human-readable headers or
84+
in the appropriate machine-readable metadata fields within text or
85+
binary files as long as those fields can be easily viewed by the user.
86+
87+
3) No Modified Version of the Font Software may use the Reserved Font
88+
Name(s) unless explicit written permission is granted by the corresponding
89+
Copyright Holder. This restriction only applies to the primary font name as
90+
presented to the users.
91+
92+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
93+
Software shall not be used to promote, endorse or advertise any
94+
Modified Version, except to acknowledge the contribution(s) of the
95+
Copyright Holder(s) and the Author(s) or with their explicit written
96+
permission.
97+
98+
5) The Font Software, modified or unmodified, in part or in whole,
99+
must be distributed entirely under this license, and must not be
100+
distributed under any other license. The requirement for fonts to
101+
remain under this license does not apply to any document created
102+
using the Font Software.
103+
104+
TERMINATION
105+
This license becomes null and void if any of the above conditions are
106+
not met.
107+
108+
DISCLAIMER
109+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
110+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
111+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
112+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
113+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
114+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
115+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
116+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
117+
OTHER DEALINGS IN THE FONT SOFTWARE.
118+
119+
--------------------------------------------------------------------------------
120+
121+
# Code: MIT License (https://opensource.org/licenses/MIT)
122+
123+
In the Font Awesome Free download, the MIT license applies to all non-font and
124+
non-icon files.
125+
126+
Copyright 2023 Fonticons, Inc.
127+
128+
Permission is hereby granted, free of charge, to any person obtaining a copy of
129+
this software and associated documentation files (the "Software"), to deal in the
130+
Software without restriction, including without limitation the rights to use, copy,
131+
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
132+
and to permit persons to whom the Software is furnished to do so, subject to the
133+
following conditions:
134+
135+
The above copyright notice and this permission notice shall be included in all
136+
copies or substantial portions of the Software.
137+
138+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
139+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
140+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
141+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
142+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
143+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
144+
145+
--------------------------------------------------------------------------------
146+
147+
# Attribution
148+
149+
Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
150+
Awesome Free files already contain embedded comments with sufficient
151+
attribution, so you shouldn't need to do anything additional when using these
152+
files normally.
153+
154+
We've kept attribution comments terse, so we ask that you do not actively work
155+
to remove them from files, especially code. They're a great way for folks to
156+
learn about Font Awesome.
157+
158+
--------------------------------------------------------------------------------
159+
160+
# Brand Icons
161+
162+
All brand icons are trademarks of their respective owners. The use of these
163+
trademarks does not indicate endorsement of the trademark holder by Font
164+
Awesome, nor vice versa. **Please do not use brand logos for any purpose except
165+
to represent the company, product, or service to which they refer.**

assets/css/all.css renamed to assets/fonts/fontawesome/css/all.css

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
2+
* Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
33
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
44
* Copyright 2023 Fonticons, Inc.
55
*/
@@ -6379,7 +6379,7 @@ readers do not read off random characters that represent icons */
63796379
font-style: normal;
63806380
font-weight: 400;
63816381
font-display: block;
6382-
src: url("../fonts/fontawesome/fa-brands-400.woff2") format("woff2"), url("../fonts/fontawesome/fa-brands-400.ttf") format("truetype"); }
6382+
src: url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.ttf") format("truetype"); }
63836383

63846384
.fab,
63856385
.fa-brands {
@@ -6550,6 +6550,9 @@ readers do not read off random characters that represent icons */
65506550
.fa-edge:before {
65516551
content: "\f282"; }
65526552

6553+
.fa-threads:before {
6554+
content: "\e618"; }
6555+
65536556
.fa-napster:before {
65546557
content: "\f3d2"; }
65556558

@@ -6718,6 +6721,9 @@ readers do not read off random characters that represent icons */
67186721
.fa-scribd:before {
67196722
content: "\f28a"; }
67206723

6724+
.fa-debian:before {
6725+
content: "\e60b"; }
6726+
67216727
.fa-openid:before {
67226728
content: "\f19b"; }
67236729

@@ -6958,6 +6964,9 @@ readers do not read off random characters that represent icons */
69586964
.fa-neos:before {
69596965
content: "\f612"; }
69606966

6967+
.fa-square-threads:before {
6968+
content: "\e619"; }
6969+
69616970
.fa-hackerrank:before {
69626971
content: "\f5f7"; }
69636972

@@ -7300,6 +7309,9 @@ readers do not read off random characters that represent icons */
73007309
.fa-erlang:before {
73017310
content: "\f39d"; }
73027311

7312+
.fa-x-twitter:before {
7313+
content: "\e61b"; }
7314+
73037315
.fa-cotton-bureau:before {
73047316
content: "\f89e"; }
73057317

@@ -7795,6 +7807,9 @@ readers do not read off random characters that represent icons */
77957807
.fa-quora:before {
77967808
content: "\f2c4"; }
77977809

7810+
.fa-square-x-twitter:before {
7811+
content: "\e61a"; }
7812+
77987813
.fa-reacteurope:before {
77997814
content: "\f75d"; }
78007815

@@ -7896,7 +7911,7 @@ readers do not read off random characters that represent icons */
78967911
font-style: normal;
78977912
font-weight: 400;
78987913
font-display: block;
7899-
src: url("../fonts/fontawesome/fa-regular-400.woff2") format("woff2"), url("../fonts/fontawesome/fa-regular-400.ttf") format("truetype"); }
7914+
src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype"); }
79007915

79017916
.far,
79027917
.fa-regular {
@@ -7910,7 +7925,7 @@ readers do not read off random characters that represent icons */
79107925
font-style: normal;
79117926
font-weight: 900;
79127927
font-display: block;
7913-
src: url("../fonts/fontawesome/fa-solid-900.woff2") format("woff2"), url("../fonts/fontawesome/fa-solid-900.ttf") format("truetype"); }
7928+
src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
79147929

79157930
.fas,
79167931
.fa-solid {
@@ -7919,37 +7934,37 @@ readers do not read off random characters that represent icons */
79197934
font-family: 'Font Awesome 5 Brands';
79207935
font-display: block;
79217936
font-weight: 400;
7922-
src: url("../fonts/fontawesome/fa-brands-400.woff2") format("woff2"), url("../fonts/fontawesome/fa-brands-400.ttf") format("truetype"); }
7937+
src: url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.ttf") format("truetype"); }
79237938

79247939
@font-face {
79257940
font-family: 'Font Awesome 5 Free';
79267941
font-display: block;
79277942
font-weight: 900;
7928-
src: url("../fonts/fontawesome/fa-solid-900.woff2") format("woff2"), url("../fonts/fontawesome/fa-solid-900.ttf") format("truetype"); }
7943+
src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
79297944

79307945
@font-face {
79317946
font-family: 'Font Awesome 5 Free';
79327947
font-display: block;
79337948
font-weight: 400;
7934-
src: url("../fonts/fontawesome/fa-regular-400.woff2") format("woff2"), url("../fonts/fontawesome/fa-regular-400.ttf") format("truetype"); }
7949+
src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype"); }
79357950
@font-face {
79367951
font-family: 'FontAwesome';
79377952
font-display: block;
7938-
src: url("../fonts/fontawesome/fa-solid-900.woff2") format("woff2"), url("../fonts/fontawesome/fa-solid-900.ttf") format("truetype"); }
7953+
src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
79397954

79407955
@font-face {
79417956
font-family: 'FontAwesome';
79427957
font-display: block;
7943-
src: url("../fonts/fontawesome/fa-brands-400.woff2") format("woff2"), url("../fonts/fontawesome/fa-brands-400.ttf") format("truetype"); }
7958+
src: url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.ttf") format("truetype"); }
79447959

79457960
@font-face {
79467961
font-family: 'FontAwesome';
79477962
font-display: block;
7948-
src: url("../fonts/fontawesome/fa-regular-400.woff2") format("woff2"), url("../fonts/fontawesome/fa-regular-400.ttf") format("truetype");
7963+
src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype");
79497964
unicode-range: U+F003,U+F006,U+F014,U+F016-F017,U+F01A-F01B,U+F01D,U+F022,U+F03E,U+F044,U+F046,U+F05C-F05D,U+F06E,U+F070,U+F087-F088,U+F08A,U+F094,U+F096-F097,U+F09D,U+F0A0,U+F0A2,U+F0A4-F0A7,U+F0C5,U+F0C7,U+F0E5-F0E6,U+F0EB,U+F0F6-F0F8,U+F10C,U+F114-F115,U+F118-F11A,U+F11C-F11D,U+F133,U+F147,U+F14E,U+F150-F152,U+F185-F186,U+F18E,U+F190-F192,U+F196,U+F1C1-F1C9,U+F1D9,U+F1DB,U+F1E3,U+F1EA,U+F1F7,U+F1F9,U+F20A,U+F247-F248,U+F24A,U+F24D,U+F255-F25B,U+F25D,U+F271-F274,U+F278,U+F27B,U+F28C,U+F28E,U+F29C,U+F2B5,U+F2B7,U+F2BA,U+F2BC,U+F2BE,U+F2C0-F2C1,U+F2C3,U+F2D0,U+F2D2,U+F2D4,U+F2DC; }
79507965

79517966
@font-face {
79527967
font-family: 'FontAwesome';
79537968
font-display: block;
7954-
src: url("../fonts/fontawesome/fa-v4compatibility.woff2") format("woff2"), url("../fonts/fontawesome/fa-v4compatibility.ttf") format("truetype");
7969+
src: url("../webfonts/fa-v4compatibility.woff2") format("woff2"), url("../webfonts/fa-v4compatibility.ttf") format("truetype");
79557970
unicode-range: U+F041,U+F047,U+F065-F066,U+F07D-F07E,U+F080,U+F08B,U+F08E,U+F090,U+F09A,U+F0AC,U+F0AE,U+F0B2,U+F0D0,U+F0D6,U+F0E4,U+F0EC,U+F10A-F10B,U+F123,U+F13E,U+F148-F149,U+F14C,U+F156,U+F15E,U+F160-F161,U+F163,U+F175-F178,U+F195,U+F1F8,U+F219,U+F27A; }

0 commit comments

Comments
 (0)