Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Font awesome to 5.13.0 #5832

Merged
merged 1 commit into from Apr 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/OrchardCore.Modules/OrchardCore.Resources/ResourceManifest.cs
Expand Up @@ -189,29 +189,29 @@ public void BuildManifests(IResourceManifestBuilder builder)
manifest
.DefineStyle("font-awesome")
.SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.min.css", "~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.css")
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.1/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.1/css/all.css")
.SetCdnIntegrity("sha384-v8BU367qNbs/aIZIxuivaU55N5GPF89WBerHoGA4QTcbUjYiLQtKdrfXnqAcXyTv", "sha384-TapX0bU5WMrwsdJW6fqyBfGLOC5iZbkX+XdrK7ZtVlDr98MazrMcR/vl9DnF5llC")
.SetVersion("5.12.1");
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/css/all.css")
.SetCdnIntegrity("sha384-Bfad6CLCknfcloXFOyFnlgtENryhrpZCe29RTifKEixXQZ38WheV+i/6YWSzkz3V", "sha384-I4s88/QBf6OKVFMRRyjRY9wYdRoEO/PnNLQ1xY+G0OQfntKp8FxRsOg9qjmtbnvL")
.SetVersion("5.13.0");

manifest
.DefineScript("font-awesome-config")
.SetUrl("~/OrchardCore.Resources/Scripts/fontawesome-config.js")
.SetVersion("5.12.1");
.SetVersion("5.13.0");

manifest
.DefineScript("font-awesome")
.SetDependencies("font-awesome-config")
.SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/js/all.min.js", "~/OrchardCore.Resources/Vendor/fontawesome-free/js/all.js")
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.1/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.1/js/all.js")
.SetCdnIntegrity("sha384-ZbbbT1gw3joYkKRqh0kWyRp32UAvdqkpbLedQJSlnI8iLQcFVxaGyrOgOJiDQTTR", "sha384-3sw2Z4++FLFBQnFshhl4I/wZ0edKqvce1WFw3eHVlzBtK6zw/tCTCwsJAaUx/+T5")
.SetVersion("5.12.1");
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/js/all.js")
.SetCdnIntegrity("sha384-ujbKXb9V3HdK7jcWL6kHL1c+2Lj4MR4Gkjl7UtwpSHg/ClpViddK9TI7yU53frPN", "sha384-Z4FE6Znluj29FL1tQBLSSjn1Pr72aJzuelbmGmqSAFTeFd42hQ4WHTc0JC30kbQi")
.SetVersion("5.13.0");

manifest
.DefineScript("font-awesome-v4-shims")
.SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/js/v4-shims.min.js", "~/OrchardCore.Resources/Vendor/fontawesome-free/js/v4-shims.js")
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.1/js/v4-shims.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.1/js/v4-shims.js")
.SetCdnIntegrity("sha384-/OZ1Lht4J1/FfstamqqFX1tF7PkDWDKbvat1bkWByC2KRJwGzm/H2bVuw8N4SD8y", "sha384-yKNuHubiLCauQntSA3OUPEjGyAU7xVogTe45AEZerhXsM1fc28V9yDcGo/UmObd9")
.SetVersion("5.12.1");
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/js/v4-shims.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/js/v4-shims.js")
.SetCdnIntegrity("sha384-XrjUu+3vbvZoLzAa5lC50XIslajkadQ9kvvTTq0odZ+LCoNEGqomuCdORdHv6wZ6", "sha384-lFg/ndztJNIxHOFryzbqXA8p6T82IJwwux+3oNIVGCuoMoLx8UbAOEf63Tt507Aq")
.SetVersion("5.13.0");

manifest
.DefineScript("jquery-resizable")
Expand Down
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
* Font Awesome Free 5.13.0 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
.fa,
Expand Down Expand Up @@ -630,6 +630,9 @@ readers do not read off random characters that represent icons */
.fa-box-open:before {
content: "\f49e"; }

.fa-box-tissue:before {
content: "\f95b"; }

.fa-boxes:before {
content: "\f468"; }

Expand Down Expand Up @@ -1293,6 +1296,9 @@ readers do not read off random characters that represent icons */
.fa-discourse:before {
content: "\f393"; }

.fa-disease:before {
content: "\f7fa"; }

.fa-divide:before {
content: "\f529"; }

Expand Down Expand Up @@ -1524,6 +1530,9 @@ readers do not read off random characters that represent icons */
.fa-fast-forward:before {
content: "\f050"; }

.fa-faucet:before {
content: "\f905"; }

.fa-fax:before {
content: "\f1ac"; }

Expand Down Expand Up @@ -2010,9 +2019,15 @@ readers do not read off random characters that represent icons */
.fa-hand-holding-heart:before {
content: "\f4be"; }

.fa-hand-holding-medical:before {
content: "\f95c"; }

.fa-hand-holding-usd:before {
content: "\f4c0"; }

.fa-hand-holding-water:before {
content: "\f4c1"; }

.fa-hand-lizard:before {
content: "\f258"; }

Expand Down Expand Up @@ -2046,6 +2061,9 @@ readers do not read off random characters that represent icons */
.fa-hand-scissors:before {
content: "\f257"; }

.fa-hand-sparkles:before {
content: "\f95d"; }

.fa-hand-spock:before {
content: "\f259"; }

Expand All @@ -2055,9 +2073,18 @@ readers do not read off random characters that represent icons */
.fa-hands-helping:before {
content: "\f4c4"; }

.fa-hands-wash:before {
content: "\f95e"; }

.fa-handshake:before {
content: "\f2b5"; }

.fa-handshake-alt-slash:before {
content: "\f95f"; }

.fa-handshake-slash:before {
content: "\f960"; }

.fa-hanukiah:before {
content: "\f6e6"; }

Expand All @@ -2079,6 +2106,18 @@ readers do not read off random characters that represent icons */
.fa-hdd:before {
content: "\f0a0"; }

.fa-head-side-cough:before {
content: "\f961"; }

.fa-head-side-cough-slash:before {
content: "\f962"; }

.fa-head-side-mask:before {
content: "\f963"; }

.fa-head-side-virus:before {
content: "\f964"; }

.fa-heading:before {
content: "\f1dc"; }

Expand Down Expand Up @@ -2151,6 +2190,9 @@ readers do not read off random characters that represent icons */
.fa-hospital-symbol:before {
content: "\f47e"; }

.fa-hospital-user:before {
content: "\f80d"; }

.fa-hot-tub:before {
content: "\f593"; }

Expand Down Expand Up @@ -2178,6 +2220,9 @@ readers do not read off random characters that represent icons */
.fa-house-damage:before {
content: "\f6f1"; }

.fa-house-user:before {
content: "\f965"; }

.fa-houzz:before {
content: "\f27c"; }

Expand Down Expand Up @@ -2364,6 +2409,9 @@ readers do not read off random characters that represent icons */
.fa-laptop-code:before {
content: "\f5fc"; }

.fa-laptop-house:before {
content: "\f966"; }

.fa-laptop-medical:before {
content: "\f812"; }

Expand Down Expand Up @@ -2481,6 +2529,12 @@ readers do not read off random characters that represent icons */
.fa-luggage-cart:before {
content: "\f59d"; }

.fa-lungs:before {
content: "\f604"; }

.fa-lungs-virus:before {
content: "\f967"; }

.fa-lyft:before {
content: "\f3c3"; }

Expand Down Expand Up @@ -2889,6 +2943,9 @@ readers do not read off random characters that represent icons */
.fa-penny-arcade:before {
content: "\f704"; }

.fa-people-arrows:before {
content: "\f968"; }

.fa-people-carry:before {
content: "\f4ce"; }

Expand Down Expand Up @@ -2985,6 +3042,9 @@ readers do not read off random characters that represent icons */
.fa-plane-departure:before {
content: "\f5b0"; }

.fa-plane-slash:before {
content: "\f969"; }

.fa-play:before {
content: "\f04b"; }

Expand Down Expand Up @@ -3060,6 +3120,12 @@ readers do not read off random characters that represent icons */
.fa-project-diagram:before {
content: "\f542"; }

.fa-pump-medical:before {
content: "\f96a"; }

.fa-pump-soap:before {
content: "\f96b"; }

.fa-pushed:before {
content: "\f3e1"; }

Expand Down Expand Up @@ -3345,6 +3411,9 @@ readers do not read off random characters that represent icons */
.fa-shield-alt:before {
content: "\f3ed"; }

.fa-shield-virus:before {
content: "\f96c"; }

.fa-ship:before {
content: "\f21a"; }

Expand Down Expand Up @@ -3495,6 +3564,9 @@ readers do not read off random characters that represent icons */
.fa-snowplow:before {
content: "\f7d2"; }

.fa-soap:before {
content: "\f96e"; }

.fa-socks:before {
content: "\f696"; }

Expand Down Expand Up @@ -3660,12 +3732,21 @@ readers do not read off random characters that represent icons */
.fa-stopwatch:before {
content: "\f2f2"; }

.fa-stopwatch-20:before {
content: "\f96f"; }

.fa-store:before {
content: "\f54e"; }

.fa-store-alt:before {
content: "\f54f"; }

.fa-store-alt-slash:before {
content: "\f970"; }

.fa-store-slash:before {
content: "\f971"; }

.fa-strava:before {
content: "\f428"; }

Expand Down Expand Up @@ -3903,6 +3984,9 @@ readers do not read off random characters that represent icons */
.fa-toilet-paper:before {
content: "\f71e"; }

.fa-toilet-paper-slash:before {
content: "\f972"; }

.fa-toolbox:before {
content: "\f552"; }

Expand Down Expand Up @@ -4215,6 +4299,15 @@ readers do not read off random characters that represent icons */
.fa-vine:before {
content: "\f1ca"; }

.fa-virus:before {
content: "\f974"; }

.fa-virus-slash:before {
content: "\f975"; }

.fa-viruses:before {
content: "\f976"; }

.fa-vk:before {
content: "\f189"; }

Expand Down Expand Up @@ -4431,7 +4524,7 @@ readers do not read off random characters that represent icons */
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: 400;
font-display: auto;
font-display: block;
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"); }

Expand All @@ -4442,7 +4535,7 @@ readers do not read off random characters that represent icons */
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-display: auto;
font-display: block;
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"); }

Expand All @@ -4453,7 +4546,7 @@ readers do not read off random characters that represent icons */
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-display: auto;
font-display: block;
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"); }

Expand Down

Large diffs are not rendered by default.

@@ -1,12 +1,12 @@
/*!
* Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
* Font Awesome Free 5.13.0 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: 400;
font-display: auto;
font-display: block;
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"); }

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.