From d8e91b307a298726e5bcdc69131704b92f72e2ca Mon Sep 17 00:00:00 2001 From: nobody Date: Tue, 2 Feb 2021 05:48:41 +0100 Subject: [PATCH] Folder renamed: fontawesome --- core/resources.js | 10 +++++----- core/shorthands.js | 8 ++++---- modules/internal/targets.js | 6 +++--- pages/statistics/statistics.js | 2 +- .../3.2.1/css/font-awesome.min.css | 0 .../3.2.1/font/fontawesome-webfont.woff | Bin .../4.7.0/css/font-awesome.min.css | 0 .../4.7.0/fonts/fontawesome-webfont.woff2 | Bin .../5.15.2/css/all.min.css | 0 .../5.15.2/css/v4-shims.min.css | 0 .../5.15.2/js/all.min.jsm | 0 .../5.15.2/sprites/brands.svg | 0 .../5.15.2/sprites/regular.svg | 0 .../5.15.2/sprites/solid.svg | 0 .../5.15.2/webfonts/fa-brands-400.woff2 | Bin .../5.15.2/webfonts/fa-regular-400.woff2 | Bin .../5.15.2/webfonts/fa-solid-900.woff2 | Bin resources/webfont/fa-loader.css | 14 +++++++------- 18 files changed, 20 insertions(+), 20 deletions(-) rename resources/{fontawesome => font-awesome}/3.2.1/css/font-awesome.min.css (100%) rename resources/{fontawesome => font-awesome}/3.2.1/font/fontawesome-webfont.woff (100%) rename resources/{fontawesome => font-awesome}/4.7.0/css/font-awesome.min.css (100%) rename resources/{fontawesome => font-awesome}/4.7.0/fonts/fontawesome-webfont.woff2 (100%) rename resources/{fontawesome => font-awesome}/5.15.2/css/all.min.css (100%) rename resources/{fontawesome => font-awesome}/5.15.2/css/v4-shims.min.css (100%) rename resources/{fontawesome => font-awesome}/5.15.2/js/all.min.jsm (100%) rename resources/{fontawesome => font-awesome}/5.15.2/sprites/brands.svg (100%) rename resources/{fontawesome => font-awesome}/5.15.2/sprites/regular.svg (100%) rename resources/{fontawesome => font-awesome}/5.15.2/sprites/solid.svg (100%) rename resources/{fontawesome => font-awesome}/5.15.2/webfonts/fa-brands-400.woff2 (100%) rename resources/{fontawesome => font-awesome}/5.15.2/webfonts/fa-regular-400.woff2 (100%) rename resources/{fontawesome => font-awesome}/5.15.2/webfonts/fa-solid-900.woff2 (100%) diff --git a/core/resources.js b/core/resources.js index 0d5d2260..ffb996b0 100644 --- a/core/resources.js +++ b/core/resources.js @@ -417,23 +417,23 @@ var resources = { }, // Font Awesome 'fontawesome': { - 'path': 'resources/fontawesome/{version}/css/font-awesome.min.css', + 'path': 'resources/font-awesome/{version}/css/font-awesome.min.css', 'type': 'text/css' }, 'fontawesome5CSS': { - 'path': 'resources/fontawesome/{version}/css/all.min.css', + 'path': 'resources/font-awesome/{version}/css/all.min.css', 'type': 'text/css' }, 'fontawesome5CSSv4shims': { - 'path': 'resources/fontawesome/{version}/css/v4-shims.min.css', + 'path': 'resources/font-awesome/{version}/css/v4-shims.min.css', 'type': 'text/css' }, 'fontawesome5JS': { - 'path': 'resources/fontawesome/{version}/js/all.min.jsm', + 'path': 'resources/font-awesome/{version}/js/all.min.jsm', 'type': 'application/javascript' }, 'fontawesomeFontsOnly': { - 'path': 'resources/fontawesome/{version}/fonts/' + 'path': 'resources/font-awesome/{version}/fonts/' }, // GSAP 'gsapBundle': { diff --git a/core/shorthands.js b/core/shorthands.js index a852bdf5..90339ea1 100644 --- a/core/shorthands.js +++ b/core/shorthands.js @@ -75,7 +75,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) { 'bundle': '' }; } else if (Regex.FONT_AWESOME.test(channelHost + channelPath)) { - lastVersion = targets.setLastVersion('/fontawesome/4.'); + lastVersion = targets.setLastVersion('/font-awesome/4.'); return { 'source': channelHost, 'versionRequested': '4.6.3', @@ -85,7 +85,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) { }; } else if (Regex.FONT_AWESOME_WITH_CODE.test(channelHost + channelPath)) { let fileExtension = channelPath.endsWith('css') ? 'css' : 'jsm'; - lastVersion = targets.setLastVersion('/fontawesome/4.'); + lastVersion = targets.setLastVersion('/font-awesome/4.'); return { 'source': channelHost, 'versionRequested': '4.6.3', @@ -120,11 +120,11 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) { }; } else if ((channelHost + channelPath) === 'netdna.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css') { // This CDN delivers 'Font Awesome v4.7.0' as latest version - lastVersion = targets.setLastVersion('/fontawesome/4.'); + lastVersion = targets.setLastVersion('/font-awesome/4.'); return { 'source': channelHost, 'versionRequested': lastVersion, - 'path': 'resources/fontawesome/' + lastVersion + '/css/font-awesome.min.css', + 'path': 'resources/font-awesome/' + lastVersion + '/css/font-awesome.min.css', 'bundle': '' }; } else if ((channelHost + channelPath) === 'cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.0.0-beta.2.4/owl.carousel.min.js') { diff --git a/modules/internal/targets.js b/modules/internal/targets.js index 9bfec4bf..97e901d8 100644 --- a/modules/internal/targets.js +++ b/modules/internal/targets.js @@ -216,11 +216,11 @@ targets.setLastVersion = function (type, version) { return '3.5.7'; } else if (type.startsWith('/flv.js/')) { return '1.5.0'; - } else if (type.startsWith('/fontawesome/3.')) { + } else if (type.startsWith('/font-awesome/3.')) { return '3.2.1'; - } else if (type.startsWith('/fontawesome/4.')) { + } else if (type.startsWith('/font-awesome/4.')) { return '4.7.0'; - } else if (type.startsWith('/fontawesome/5.')) { + } else if (type.startsWith('/font-awesome/5.')) { return '5.15.2'; } else if (type.startsWith('/gsap/1.')) { return '1.20.5'; diff --git a/pages/statistics/statistics.js b/pages/statistics/statistics.js index 9629acff..0b4ecdd8 100644 --- a/pages/statistics/statistics.js +++ b/pages/statistics/statistics.js @@ -188,7 +188,7 @@ statistics._displayNameOfFramework = function (str, type) { if (filename === 'Unknown') { filename = targets.determineBundle(str); - if (filename === '' && str.startsWith('resources/fontawesome/')) { + if (filename === '' && str.startsWith('resources/font-awesome/')) { filename = 'Font Awesome (Fonts)' } } diff --git a/resources/fontawesome/3.2.1/css/font-awesome.min.css b/resources/font-awesome/3.2.1/css/font-awesome.min.css similarity index 100% rename from resources/fontawesome/3.2.1/css/font-awesome.min.css rename to resources/font-awesome/3.2.1/css/font-awesome.min.css diff --git a/resources/fontawesome/3.2.1/font/fontawesome-webfont.woff b/resources/font-awesome/3.2.1/font/fontawesome-webfont.woff similarity index 100% rename from resources/fontawesome/3.2.1/font/fontawesome-webfont.woff rename to resources/font-awesome/3.2.1/font/fontawesome-webfont.woff diff --git a/resources/fontawesome/4.7.0/css/font-awesome.min.css b/resources/font-awesome/4.7.0/css/font-awesome.min.css similarity index 100% rename from resources/fontawesome/4.7.0/css/font-awesome.min.css rename to resources/font-awesome/4.7.0/css/font-awesome.min.css diff --git a/resources/fontawesome/4.7.0/fonts/fontawesome-webfont.woff2 b/resources/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from resources/fontawesome/4.7.0/fonts/fontawesome-webfont.woff2 rename to resources/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2 diff --git a/resources/fontawesome/5.15.2/css/all.min.css b/resources/font-awesome/5.15.2/css/all.min.css similarity index 100% rename from resources/fontawesome/5.15.2/css/all.min.css rename to resources/font-awesome/5.15.2/css/all.min.css diff --git a/resources/fontawesome/5.15.2/css/v4-shims.min.css b/resources/font-awesome/5.15.2/css/v4-shims.min.css similarity index 100% rename from resources/fontawesome/5.15.2/css/v4-shims.min.css rename to resources/font-awesome/5.15.2/css/v4-shims.min.css diff --git a/resources/fontawesome/5.15.2/js/all.min.jsm b/resources/font-awesome/5.15.2/js/all.min.jsm similarity index 100% rename from resources/fontawesome/5.15.2/js/all.min.jsm rename to resources/font-awesome/5.15.2/js/all.min.jsm diff --git a/resources/fontawesome/5.15.2/sprites/brands.svg b/resources/font-awesome/5.15.2/sprites/brands.svg similarity index 100% rename from resources/fontawesome/5.15.2/sprites/brands.svg rename to resources/font-awesome/5.15.2/sprites/brands.svg diff --git a/resources/fontawesome/5.15.2/sprites/regular.svg b/resources/font-awesome/5.15.2/sprites/regular.svg similarity index 100% rename from resources/fontawesome/5.15.2/sprites/regular.svg rename to resources/font-awesome/5.15.2/sprites/regular.svg diff --git a/resources/fontawesome/5.15.2/sprites/solid.svg b/resources/font-awesome/5.15.2/sprites/solid.svg similarity index 100% rename from resources/fontawesome/5.15.2/sprites/solid.svg rename to resources/font-awesome/5.15.2/sprites/solid.svg diff --git a/resources/fontawesome/5.15.2/webfonts/fa-brands-400.woff2 b/resources/font-awesome/5.15.2/webfonts/fa-brands-400.woff2 similarity index 100% rename from resources/fontawesome/5.15.2/webfonts/fa-brands-400.woff2 rename to resources/font-awesome/5.15.2/webfonts/fa-brands-400.woff2 diff --git a/resources/fontawesome/5.15.2/webfonts/fa-regular-400.woff2 b/resources/font-awesome/5.15.2/webfonts/fa-regular-400.woff2 similarity index 100% rename from resources/fontawesome/5.15.2/webfonts/fa-regular-400.woff2 rename to resources/font-awesome/5.15.2/webfonts/fa-regular-400.woff2 diff --git a/resources/fontawesome/5.15.2/webfonts/fa-solid-900.woff2 b/resources/font-awesome/5.15.2/webfonts/fa-solid-900.woff2 similarity index 100% rename from resources/fontawesome/5.15.2/webfonts/fa-solid-900.woff2 rename to resources/font-awesome/5.15.2/webfonts/fa-solid-900.woff2 diff --git a/resources/webfont/fa-loader.css b/resources/webfont/fa-loader.css index 02b628d8..924c2201 100644 --- a/resources/webfont/fa-loader.css +++ b/resources/webfont/fa-loader.css @@ -3,17 +3,17 @@ * File modified by nobody/LocalCDN * */ -@import url('../fontawesome/4.7.0/css/font-awesome.min.css'); +@import url('../font-awesome/4.7.0/css/font-awesome.min.css'); /* FONT PATH * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fontawesome/4.7.0/fonts/fontawesome-webfont.eot'); - src: url('../fontawesome/4.7.0/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), - url('../fontawesome/4.7.0/fonts/fontawesome-webfont.woff2') format('woff2'), - url('../fontawesome/4.7.0/fonts/fontawesome-webfont.woff') format('woff'), - url('../fontawesome/4.7.0/fonts/fontawesome-webfont.ttf') format('truetype'), - url('../fontawesome/4.7.0/fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg'); + src: url('../font-awesome/4.7.0/fonts/fontawesome-webfont.eot'); + src: url('../font-awesome/4.7.0/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), + url('../font-awesome/4.7.0/fonts/fontawesome-webfont.woff2') format('woff2'), + url('../font-awesome/4.7.0/fonts/fontawesome-webfont.woff') format('woff'), + url('../font-awesome/4.7.0/fonts/fontawesome-webfont.ttf') format('truetype'), + url('../font-awesome/4.7.0/fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; }