From eb66b6853d8c19482c42f7902c161f0436afcdc2 Mon Sep 17 00:00:00 2001 From: Paul Derscheid Date: Mon, 26 Aug 2024 14:00:10 +0200 Subject: [PATCH] Bug 35402: (follow-up) Remove bootstrap version 4 and revert import paths to 'bootstrap' This patch - removes bootstrap 4 from the project dependencies. - reverts the import paths for sass back to 'bootstrap' from 'bootstrap5'. - updates yarn's lockfile. --- .../intranet-tmpl/prog/css/src/installer.scss | 36 ++++----- .../prog/css/src/staff-global.scss | 80 +++++++++---------- .../opac-tmpl/bootstrap/css/src/_common.scss | 78 +++++++++--------- package.json | 3 +- yarn.lock | 7 +- 5 files changed, 99 insertions(+), 105 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss b/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss index 1450471404..873bb6f435 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss @@ -1,31 +1,31 @@ // scss-docs-start import-stack // Configuration -@import "~bootstrap5/scss/_functions"; +@import "~bootstrap/scss/_functions"; // Include any default variable overrides here @import "_variables"; // Include remainder of required Bootstrap stylesheets -@import "~bootstrap5/scss/_variables"; -@import "~bootstrap5/scss/_mixins"; +@import "~bootstrap/scss/_variables"; +@import "~bootstrap/scss/_mixins"; $enable-dark-mode: false; -@import "~bootstrap5/scss/_maps"; -@import "~bootstrap5/scss/_utilities"; -@import "~bootstrap5/scss/_root"; -@import "~bootstrap5/scss/_reboot"; -@import "~bootstrap5/scss/_type"; -@import "~bootstrap5/scss/_containers"; -@import "~bootstrap5/scss/_grid"; -@import "~bootstrap5/scss/_forms"; -@import "~bootstrap5/scss/_buttons"; -@import "~bootstrap5/scss/_transitions"; -@import "~bootstrap5/scss/_breadcrumb"; -@import "~bootstrap5/scss/_badge"; -@import "~bootstrap5/scss/_alert"; -@import "~bootstrap5/scss/_helpers"; -@import "~bootstrap5/scss/_utilities/api"; +@import "~bootstrap/scss/_maps"; +@import "~bootstrap/scss/_utilities"; +@import "~bootstrap/scss/_root"; +@import "~bootstrap/scss/_reboot"; +@import "~bootstrap/scss/_type"; +@import "~bootstrap/scss/_containers"; +@import "~bootstrap/scss/_grid"; +@import "~bootstrap/scss/_forms"; +@import "~bootstrap/scss/_buttons"; +@import "~bootstrap/scss/_transitions"; +@import "~bootstrap/scss/_breadcrumb"; +@import "~bootstrap/scss/_badge"; +@import "~bootstrap/scss/_alert"; +@import "~bootstrap/scss/_helpers"; +@import "~bootstrap/scss/_utilities/api"; @import "_flatpickr"; body { diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 0a19ded611..2d1c4ea8a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1,60 +1,60 @@ -@import "~bootstrap5/scss/mixins/_banner"; -@import "~bootstrap5/scss/mixins/_banner"; +@import "~bootstrap/scss/mixins/_banner"; +@import "~bootstrap/scss/mixins/_banner"; @include bsBanner(""); // scss-docs-start import-stack -@import "~bootstrap5/scss/_functions"; +@import "~bootstrap/scss/_functions"; // Configuration // Include any default variable overrides here @import "_variables"; // Include remainder of required Bootstrap stylesheets -@import "~bootstrap5/scss/_variables"; -@import "~bootstrap5/scss/_mixins"; +@import "~bootstrap/scss/_variables"; +@import "~bootstrap/scss/_mixins"; $enable-dark-mode: false; -@import "~bootstrap5/scss/_maps"; -@import "~bootstrap5/scss/_utilities"; +@import "~bootstrap/scss/_maps"; +@import "~bootstrap/scss/_utilities"; // Layout & components -@import "~bootstrap5/scss/_root"; -@import "~bootstrap5/scss/_reboot"; -@import "~bootstrap5/scss/_type"; -@import "~bootstrap5/scss/_images"; -@import "~bootstrap5/scss/_containers"; -@import "~bootstrap5/scss/_grid"; -@import "~bootstrap5/scss/_tables"; -@import "~bootstrap5/scss/_forms"; -@import "~bootstrap5/scss/_buttons"; -@import "~bootstrap5/scss/_transitions"; -@import "~bootstrap5/scss/_dropdown"; -@import "~bootstrap5/scss/_button-group"; -@import "~bootstrap5/scss/_nav"; -@import "~bootstrap5/scss/_navbar"; -@import "~bootstrap5/scss/_card"; -@import "~bootstrap5/scss/_accordion"; -@import "~bootstrap5/scss/_breadcrumb"; -@import "~bootstrap5/scss/_pagination"; -@import "~bootstrap5/scss/_badge"; -@import "~bootstrap5/scss/_alert"; -@import "~bootstrap5/scss/_progress"; -@import "~bootstrap5/scss/_list-group"; -@import "~bootstrap5/scss/_close"; -@import "~bootstrap5/scss/_toasts"; -@import "~bootstrap5/scss/_modal"; -@import "~bootstrap5/scss/_tooltip"; -@import "~bootstrap5/scss/_popover"; -@import "~bootstrap5/scss/_carousel"; -@import "~bootstrap5/scss/_spinners"; -@import "~bootstrap5/scss/_offcanvas"; -@import "~bootstrap5/scss/_placeholders"; +@import "~bootstrap/scss/_root"; +@import "~bootstrap/scss/_reboot"; +@import "~bootstrap/scss/_type"; +@import "~bootstrap/scss/_images"; +@import "~bootstrap/scss/_containers"; +@import "~bootstrap/scss/_grid"; +@import "~bootstrap/scss/_tables"; +@import "~bootstrap/scss/_forms"; +@import "~bootstrap/scss/_buttons"; +@import "~bootstrap/scss/_transitions"; +@import "~bootstrap/scss/_dropdown"; +@import "~bootstrap/scss/_button-group"; +@import "~bootstrap/scss/_nav"; +@import "~bootstrap/scss/_navbar"; +@import "~bootstrap/scss/_card"; +@import "~bootstrap/scss/_accordion"; +@import "~bootstrap/scss/_breadcrumb"; +@import "~bootstrap/scss/_pagination"; +@import "~bootstrap/scss/_badge"; +@import "~bootstrap/scss/_alert"; +@import "~bootstrap/scss/_progress"; +@import "~bootstrap/scss/_list-group"; +@import "~bootstrap/scss/_close"; +@import "~bootstrap/scss/_toasts"; +@import "~bootstrap/scss/_modal"; +@import "~bootstrap/scss/_tooltip"; +@import "~bootstrap/scss/_popover"; +@import "~bootstrap/scss/_carousel"; +@import "~bootstrap/scss/_spinners"; +@import "~bootstrap/scss/_offcanvas"; +@import "~bootstrap/scss/_placeholders"; // Helpers -@import "~bootstrap5/scss/_helpers"; +@import "~bootstrap/scss/_helpers"; // Utilities -@import "~bootstrap5/scss/utilities/_api"; +@import "~bootstrap/scss/utilities/_api"; // scss-docs-end import-stack @import "_mixins"; diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss index 898651216d..647012a0a0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss @@ -36,63 +36,63 @@ $high-contrast-grey: #666666; box-shadow: inset 0 1px 1px rgba( 0, 0, 0, .075 ), 0 0 8px rgba( 194, 228, 136, .6 ); } -@import "~bootstrap5/scss/mixins/_banner"; +@import "~bootstrap/scss/mixins/_banner"; @include bsBanner(""); // scss-docs-start import-stack // Configuration -@import "~bootstrap5/scss/_functions"; +@import "~bootstrap/scss/_functions"; // Include any default variable overrides here @import "_variables"; // Include remainder of required Bootstrap stylesheets -@import "~bootstrap5/scss/_variables"; -@import "~bootstrap5/scss/_mixins"; +@import "~bootstrap/scss/_variables"; +@import "~bootstrap/scss/_mixins"; $enable-dark-mode: false; -@import "~bootstrap5/scss/_maps"; -@import "~bootstrap5/scss/_utilities"; +@import "~bootstrap/scss/_maps"; +@import "~bootstrap/scss/_utilities"; // Layout & components -@import "~bootstrap5/scss/_root"; -@import "~bootstrap5/scss/_reboot"; -@import "~bootstrap5/scss/_type"; -@import "~bootstrap5/scss/_images"; -@import "~bootstrap5/scss/_containers"; -@import "~bootstrap5/scss/_grid"; -@import "~bootstrap5/scss/_tables"; -@import "~bootstrap5/scss/_forms"; -@import "~bootstrap5/scss/_buttons"; -@import "~bootstrap5/scss/_transitions"; -@import "~bootstrap5/scss/_dropdown"; -@import "~bootstrap5/scss/_button-group"; -@import "~bootstrap5/scss/_nav"; -@import "~bootstrap5/scss/_navbar"; -@import "~bootstrap5/scss/_card"; -@import "~bootstrap5/scss/_accordion"; -@import "~bootstrap5/scss/_breadcrumb"; -@import "~bootstrap5/scss/_pagination"; -@import "~bootstrap5/scss/_badge"; -@import "~bootstrap5/scss/_alert"; -@import "~bootstrap5/scss/_progress"; -@import "~bootstrap5/scss/_list-group"; -@import "~bootstrap5/scss/_close"; -@import "~bootstrap5/scss/_toasts"; -@import "~bootstrap5/scss/_modal"; -@import "~bootstrap5/scss/_tooltip"; -@import "~bootstrap5/scss/_popover"; -@import "~bootstrap5/scss/_carousel"; -@import "~bootstrap5/scss/_spinners"; -@import "~bootstrap5/scss/_offcanvas"; -@import "~bootstrap5/scss/_placeholders"; +@import "~bootstrap/scss/_root"; +@import "~bootstrap/scss/_reboot"; +@import "~bootstrap/scss/_type"; +@import "~bootstrap/scss/_images"; +@import "~bootstrap/scss/_containers"; +@import "~bootstrap/scss/_grid"; +@import "~bootstrap/scss/_tables"; +@import "~bootstrap/scss/_forms"; +@import "~bootstrap/scss/_buttons"; +@import "~bootstrap/scss/_transitions"; +@import "~bootstrap/scss/_dropdown"; +@import "~bootstrap/scss/_button-group"; +@import "~bootstrap/scss/_nav"; +@import "~bootstrap/scss/_navbar"; +@import "~bootstrap/scss/_card"; +@import "~bootstrap/scss/_accordion"; +@import "~bootstrap/scss/_breadcrumb"; +@import "~bootstrap/scss/_pagination"; +@import "~bootstrap/scss/_badge"; +@import "~bootstrap/scss/_alert"; +@import "~bootstrap/scss/_progress"; +@import "~bootstrap/scss/_list-group"; +@import "~bootstrap/scss/_close"; +@import "~bootstrap/scss/_toasts"; +@import "~bootstrap/scss/_modal"; +@import "~bootstrap/scss/_tooltip"; +@import "~bootstrap/scss/_popover"; +@import "~bootstrap/scss/_carousel"; +@import "~bootstrap/scss/_spinners"; +@import "~bootstrap/scss/_offcanvas"; +@import "~bootstrap/scss/_placeholders"; // Helpers -@import "~bootstrap5/scss/_helpers"; +@import "~bootstrap/scss/_helpers"; // Utilities -@import "~bootstrap5/scss/utilities/_api"; +@import "~bootstrap/scss/utilities/_api"; // scss-docs-end import-stack diff --git a/package.json b/package.json index 83f40a22c7..1bec490892 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,7 @@ "@redocly/cli": "^1.11.0", "@vue/cli-service": "^5.0.1", "babel-core": "^7.0.0-beta.3", - "bootstrap": "^4.5.2", - "bootstrap5": "npm:bootstrap@5.3.3", + "bootstrap": "^5.3.3", "css-loader": "^6.6.0", "cypress": "^12.17.2", "cypress-mysql": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index ff80010c7b..1ea579535c 100755 --- a/yarn.lock +++ b/yarn.lock @@ -2604,16 +2604,11 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== -"bootstrap5@npm:bootstrap@5.3.3": +bootstrap@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== -bootstrap@^4.5.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479" - integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ== - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" -- 2.46.0