FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2025-04-05 08:09:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Important font weights, fixes #15689

Browse Source
This commit is contained in:
FragsterAt 2019-10-15 12:01:32 +03:00
parent 1c1b102b2b
commit df254360d0
34 changed files with 2032 additions and 2032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/all.css
View File

@ -4391,7 +4391,7 @@ readers do not read off random characters that represent icons */
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: auto;
src: url("../webfonts/fa-brands-400.eot");
src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
@ -4401,18 +4401,18 @@ readers do not read off random characters that represent icons */
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: auto;
src: url("../webfonts/fa-regular-400.eot");
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400; }
font-weight: 400 !important; }
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: auto;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
@ -4420,4 +4420,4 @@ readers do not read off random characters that represent icons */
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900; }
font-weight: 900 !important; }

2
css/brands.css
View File

@ -5,7 +5,7 @@
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: auto;
src: url("../webfonts/fa-brands-400.eot");
src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }

4
css/regular.css
View File

@ -5,11 +5,11 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: auto;
src: url("../webfonts/fa-regular-400.eot");
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400; }
font-weight: 400 !important; }

4
css/solid.css
View File

@ -5,7 +5,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: auto;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
@ -13,4 +13,4 @@
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900; }
font-weight: 900 !important; }

660
css/v4-shims.css
View File

File diff suppressed because it is too large Load Diff

10
js-packages/@fortawesome/fontawesome-free/css/all.css
View File

@ -4391,7 +4391,7 @@ readers do not read off random characters that represent icons */
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: auto;
src: url("../webfonts/fa-brands-400.eot");
src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
@ -4401,18 +4401,18 @@ readers do not read off random characters that represent icons */
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: auto;
src: url("../webfonts/fa-regular-400.eot");
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400; }
font-weight: 400 !important; }
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: auto;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
@ -4420,4 +4420,4 @@ readers do not read off random characters that represent icons */
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900; }
font-weight: 900 !important; }

2
js-packages/@fortawesome/fontawesome-free/css/brands.css
View File

@ -5,7 +5,7 @@
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: auto;
src: url("../webfonts/fa-brands-400.eot");
src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }

4
js-packages/@fortawesome/fontawesome-free/css/regular.css
View File

@ -5,11 +5,11 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: auto;
src: url("../webfonts/fa-regular-400.eot");
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400; }
font-weight: 400 !important; }

4
js-packages/@fortawesome/fontawesome-free/css/solid.css
View File

@ -5,7 +5,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: auto;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
@ -13,4 +13,4 @@
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900; }
font-weight: 900 !important; }

660
js-packages/@fortawesome/fontawesome-free/css/v4-shims.css
View File

File diff suppressed because it is too large Load Diff

4
js-packages/@fortawesome/fontawesome-free/js/conflict-detection.js
View File

@ -891,8 +891,8 @@
console.info("Testing ".concat(testCount, " possible conflicts."));
console.info("We'll wait about ".concat(Math.round(WINDOW.FontAwesomeDetection.timeout / 10) / 100, " seconds while testing these and\n") + "then up to another ".concat(Math.round(WINDOW.FontAwesomeDetection.resultsCollectionMaxWait / 10) / 100, " to allow the browser time\n") + "to accumulate the results. But we'll probably be outta here way before then.\n\n");
console.info("You can adjust those durations by assigning values to these attributes on the <script> element that loads this detection:");
console.info("\t%c".concat(timeoutAttr, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), 'font-weight: bold;', 'font-size: normal;');
console.info("\t%c".concat(resultsCollectionMaxWaitAttr, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), 'font-weight: bold;', 'font-size: normal;');
console.info("\t%c".concat(timeoutAttr, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), 'font-weight: bold !important;', 'font-size: normal;');
console.info("\t%c".concat(resultsCollectionMaxWaitAttr, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), 'font-weight: bold !important;', 'font-size: normal;');
pollUntil({
// Give this overall timer a little extra cushion
maxDuration: masterTimeout,

4
js-packages/@fortawesome/fontawesome-free/js/conflict-detection.min.js vendored
View File

@ -260,8 +260,8 @@ e = this, t = function(e) {
console.info("We didn't find anything that needs testing for conflicts. Ergo, no conflicts.")) : (console.info("Testing ".concat(i, " possible conflicts.")),
console.info("We'll wait about ".concat(Math.round(l.FontAwesomeDetection.timeout / 10) / 100, " seconds while testing these and\n") + "then up to another ".concat(Math.round(l.FontAwesomeDetection.resultsCollectionMaxWait / 10) / 100, " to allow the browser time\n") + "to accumulate the results. But we'll probably be outta here way before then.\n\n"),
console.info("You can adjust those durations by assigning values to these attributes on the <script> element that loads this detection:"),
console.info("\t%c".concat(A, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), "font-weight: bold;", "font-size: normal;"),
console.info("\t%c".concat(T, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), "font-weight: bold;", "font-size: normal;"),
console.info("\t%c".concat(A, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), "font-weight: bold !important;", "font-size: normal;"),
console.info("\t%c".concat(T, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), "font-weight: bold !important;", "font-size: normal;"),
D({
maxDuration: c,
showProgress: !0,

2
js-packages/@fortawesome/fontawesome-free/less/_mixins.less
View File

@ -7,7 +7,7 @@
display: inline-block;
font-style: normal;
font-variant: normal;
font-weight: normal;
font-weight: normal !important;
line-height: 1;
}

660
js-packages/@fortawesome/fontawesome-free/less/_shims.less
View File

File diff suppressed because it is too large Load Diff

2
js-packages/@fortawesome/fontawesome-free/less/brands.less
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: @fa-font-display;
src: url('@{fa-font-path}/fa-brands-400.eot');
src: url('@{fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),

4
js-packages/@fortawesome/fontawesome-free/less/regular.less
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: @fa-font-display;
src: url('@{fa-font-path}/fa-regular-400.eot');
src: url('@{fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
@ -19,5 +19,5 @@
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400;
font-weight: 400 !important;
}

4
js-packages/@fortawesome/fontawesome-free/less/solid.less
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: @fa-font-display;
src: url('@{fa-font-path}/fa-solid-900.eot');
src: url('@{fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
@ -20,5 +20,5 @@
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
font-weight: 900 !important;
}

2
js-packages/@fortawesome/fontawesome-free/scss/_mixins.scss
View File

@ -7,7 +7,7 @@
display: inline-block;
font-style: normal;
font-variant: normal;
font-weight: normal;
font-weight: normal !important;
line-height: 1;
}

660
js-packages/@fortawesome/fontawesome-free/scss/_shims.scss
View File

File diff suppressed because it is too large Load Diff

2
js-packages/@fortawesome/fontawesome-free/scss/brands.scss
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-brands-400.eot');
src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),

4
js-packages/@fortawesome/fontawesome-free/scss/regular.scss
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-regular-400.eot');
src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
@ -19,5 +19,5 @@
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400;
font-weight: 400 !important;
}

4
js-packages/@fortawesome/fontawesome-free/scss/solid.scss
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-solid-900.eot');
src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
@ -20,5 +20,5 @@
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
font-weight: 900 !important;
}

4
js/conflict-detection.js
View File

@ -891,8 +891,8 @@
console.info("Testing ".concat(testCount, " possible conflicts."));
console.info("We'll wait about ".concat(Math.round(WINDOW.FontAwesomeDetection.timeout / 10) / 100, " seconds while testing these and\n") + "then up to another ".concat(Math.round(WINDOW.FontAwesomeDetection.resultsCollectionMaxWait / 10) / 100, " to allow the browser time\n") + "to accumulate the results. But we'll probably be outta here way before then.\n\n");
console.info("You can adjust those durations by assigning values to these attributes on the <script> element that loads this detection:");
console.info("\t%c".concat(timeoutAttr, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), 'font-weight: bold;', 'font-size: normal;');
console.info("\t%c".concat(resultsCollectionMaxWaitAttr, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), 'font-weight: bold;', 'font-size: normal;');
console.info("\t%c".concat(timeoutAttr, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), 'font-weight: bold !important;', 'font-size: normal;');
console.info("\t%c".concat(resultsCollectionMaxWaitAttr, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), 'font-weight: bold !important;', 'font-size: normal;');
pollUntil({
// Give this overall timer a little extra cushion
maxDuration: masterTimeout,

4
js/conflict-detection.min.js vendored
View File

@ -260,8 +260,8 @@ e = this, t = function(e) {
console.info("We didn't find anything that needs testing for conflicts. Ergo, no conflicts.")) : (console.info("Testing ".concat(i, " possible conflicts.")),
console.info("We'll wait about ".concat(Math.round(l.FontAwesomeDetection.timeout / 10) / 100, " seconds while testing these and\n") + "then up to another ".concat(Math.round(l.FontAwesomeDetection.resultsCollectionMaxWait / 10) / 100, " to allow the browser time\n") + "to accumulate the results. But we'll probably be outta here way before then.\n\n"),
console.info("You can adjust those durations by assigning values to these attributes on the <script> element that loads this detection:"),
console.info("\t%c".concat(A, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), "font-weight: bold;", "font-size: normal;"),
console.info("\t%c".concat(T, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), "font-weight: bold;", "font-size: normal;"),
console.info("\t%c".concat(A, "%c: milliseconds to wait for each test before deciding whether it's a conflict."), "font-weight: bold !important;", "font-size: normal;"),
console.info("\t%c".concat(T, "%c: milliseconds to wait for the browser to accumulate test results before giving up."), "font-weight: bold !important;", "font-size: normal;"),
D({
maxDuration: c,
showProgress: !0,

2
less/_mixins.less
View File

@ -7,7 +7,7 @@
display: inline-block;
font-style: normal;
font-variant: normal;
font-weight: normal;
font-weight: normal !important;
line-height: 1;
}

660
less/_shims.less
View File

File diff suppressed because it is too large Load Diff

2
less/brands.less
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: @fa-font-display;
src: url('@{fa-font-path}/fa-brands-400.eot');
src: url('@{fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),

4
less/regular.less
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: @fa-font-display;
src: url('@{fa-font-path}/fa-regular-400.eot');
src: url('@{fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
@ -19,5 +19,5 @@
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400;
font-weight: 400 !important;
}

4
less/solid.less
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: @fa-font-display;
src: url('@{fa-font-path}/fa-solid-900.eot');
src: url('@{fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
@ -20,5 +20,5 @@
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
font-weight: 900 !important;
}

2
scss/_mixins.scss
View File

@ -7,7 +7,7 @@
display: inline-block;
font-style: normal;
font-variant: normal;
font-weight: normal;
font-weight: normal !important;
line-height: 1;
}

660
scss/_shims.scss
View File

File diff suppressed because it is too large Load Diff

2
scss/brands.scss
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-weight: normal !important;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-brands-400.eot');
src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),

4
scss/regular.scss
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-weight: 400 !important;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-regular-400.eot');
src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
@ -19,5 +19,5 @@
.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400;
font-weight: 400 !important;
}

4
scss/solid.scss
View File

@ -7,7 +7,7 @@
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-weight: 900 !important;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-solid-900.eot');
src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
@ -20,5 +20,5 @@
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
font-weight: 900 !important;
}