From ae9d3990be0031d325a25eed089b83cc72e0a0d5 Mon Sep 17 00:00:00 2001 From: nobody Date: Tue, 2 Feb 2021 05:45:35 +0100 Subject: [PATCH] Folder renamed: bootstrap --- core/resources.js | 6 +++--- core/shorthands.js | 2 +- modules/internal/targets.js | 4 ++-- .../3.3.7/bootstrap.min.css | 0 .../3.3.7/bootstrap.min.jsm | 0 .../3.4.1/bootstrap.min.css | 0 .../3.4.1/bootstrap.min.jsm | 0 .../4.6.0/bootstrap.min.css | 0 .../4.6.0/bootstrap.min.jsm | 0 .../{bootstrap => twitter-bootstrap}/4.6.0/note | 0 .../fonts/glyphicons-halflings-regular.woff2 | Bin 11 files changed, 6 insertions(+), 6 deletions(-) rename resources/{bootstrap => twitter-bootstrap}/3.3.7/bootstrap.min.css (100%) rename resources/{bootstrap => twitter-bootstrap}/3.3.7/bootstrap.min.jsm (100%) rename resources/{bootstrap => twitter-bootstrap}/3.4.1/bootstrap.min.css (100%) rename resources/{bootstrap => twitter-bootstrap}/3.4.1/bootstrap.min.jsm (100%) rename resources/{bootstrap => twitter-bootstrap}/4.6.0/bootstrap.min.css (100%) rename resources/{bootstrap => twitter-bootstrap}/4.6.0/bootstrap.min.jsm (100%) rename resources/{bootstrap => twitter-bootstrap}/4.6.0/note (100%) rename resources/{bootstrap => twitter-bootstrap}/fonts/glyphicons-halflings-regular.woff2 (100%) diff --git a/core/resources.js b/core/resources.js index 6f65f121..a8640417 100644 --- a/core/resources.js +++ b/core/resources.js @@ -218,15 +218,15 @@ var resources = { }, // Bootstrap 'bootstrapJS': { - 'path': 'resources/bootstrap/{version}/bootstrap.min.jsm', + 'path': 'resources/twitter-bootstrap/{version}/bootstrap.min.jsm', 'type': 'application/javascript' }, 'bootstrapCSS': { - 'path': 'resources/bootstrap/{version}/bootstrap.min.css', + 'path': 'resources/twitter-bootstrap/{version}/bootstrap.min.css', 'type': 'text/css' }, 'bootstrapFontsOnly': { - 'path': 'resources/bootstrap/fonts/' + 'path': 'resources/twitter-bootstrap/fonts/' }, // Bootstrap Daterangepicker 'bootstrapDaterangepicker': { diff --git a/core/shorthands.js b/core/shorthands.js index 87a208a7..a852bdf5 100644 --- a/core/shorthands.js +++ b/core/shorthands.js @@ -160,7 +160,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) { } else if (Regex.BOOTSTRAP_FONTS_ONLY.test(channelPath)) { return { 'source': channelHost, - 'path': 'resources/bootstrap/fonts/' + helpers.extractFilenameFromPath(channelPath), + 'path': 'resources/twitter-bootstrap/fonts/' + helpers.extractFilenameFromPath(channelPath), 'bundle': 'Bootstrap (Fonts)' }; } else if (channelHost + channelPath === 'cdn.jsdelivr.net/npm/js-cookie@beta/dist/js.cookie.min.js') { diff --git a/modules/internal/targets.js b/modules/internal/targets.js index 432ba806..d5aaa0ab 100644 --- a/modules/internal/targets.js +++ b/modules/internal/targets.js @@ -139,10 +139,10 @@ targets.setLastVersion = function (type, version) { return '4.4.0'; } else if (type.startsWith('/bootbox.js/5.')) { return '5.5.2'; - } else if (type.startsWith('/bootstrap/3.')) { + } else if (type.startsWith('/twitter-bootstrap/3.')) { if (helpers.compareVersion('3.3.7', version)) return '3.3.7'; // <= 3.3.7 else return '3.4.1'; - } else if (type.startsWith('/bootstrap/4.')) { + } else if (type.startsWith('/twitter-bootstrap/4.')) { return '4.6.0'; } else if (type.startsWith('/bootstrap-daterangepicker/2.')) { return '2.1.27'; diff --git a/resources/bootstrap/3.3.7/bootstrap.min.css b/resources/twitter-bootstrap/3.3.7/bootstrap.min.css similarity index 100% rename from resources/bootstrap/3.3.7/bootstrap.min.css rename to resources/twitter-bootstrap/3.3.7/bootstrap.min.css diff --git a/resources/bootstrap/3.3.7/bootstrap.min.jsm b/resources/twitter-bootstrap/3.3.7/bootstrap.min.jsm similarity index 100% rename from resources/bootstrap/3.3.7/bootstrap.min.jsm rename to resources/twitter-bootstrap/3.3.7/bootstrap.min.jsm diff --git a/resources/bootstrap/3.4.1/bootstrap.min.css b/resources/twitter-bootstrap/3.4.1/bootstrap.min.css similarity index 100% rename from resources/bootstrap/3.4.1/bootstrap.min.css rename to resources/twitter-bootstrap/3.4.1/bootstrap.min.css diff --git a/resources/bootstrap/3.4.1/bootstrap.min.jsm b/resources/twitter-bootstrap/3.4.1/bootstrap.min.jsm similarity index 100% rename from resources/bootstrap/3.4.1/bootstrap.min.jsm rename to resources/twitter-bootstrap/3.4.1/bootstrap.min.jsm diff --git a/resources/bootstrap/4.6.0/bootstrap.min.css b/resources/twitter-bootstrap/4.6.0/bootstrap.min.css similarity index 100% rename from resources/bootstrap/4.6.0/bootstrap.min.css rename to resources/twitter-bootstrap/4.6.0/bootstrap.min.css diff --git a/resources/bootstrap/4.6.0/bootstrap.min.jsm b/resources/twitter-bootstrap/4.6.0/bootstrap.min.jsm similarity index 100% rename from resources/bootstrap/4.6.0/bootstrap.min.jsm rename to resources/twitter-bootstrap/4.6.0/bootstrap.min.jsm diff --git a/resources/bootstrap/4.6.0/note b/resources/twitter-bootstrap/4.6.0/note similarity index 100% rename from resources/bootstrap/4.6.0/note rename to resources/twitter-bootstrap/4.6.0/note diff --git a/resources/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/resources/twitter-bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from resources/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to resources/twitter-bootstrap/fonts/glyphicons-halflings-regular.woff2