gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Paul Derscheid 2024-08-26 14:00:10 +02:00 committed by Katrin Fischer
parent 8b77d7fa72
commit bdaa0e6cb7
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
5 changed files with 99 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
koha-tmpl/intranet-tmpl/prog/css/src/installer.scss
View File

@ -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 {

80
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
View File

@ -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";

78
koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
View File

@ -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

3
package.json
View File

@ -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",

7
yarn.lock
View File

@ -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"