From df16ca9a60cfaa97bc46037e4e389bacd0b2738d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 29 Nov 2023 13:20:14 +0100 Subject: [PATCH] force bootstrap to be restricted to version 5.2 --- package.json | 12 ++++++------ .../Resources/public/module/bootstrap/_shared.scss | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 8ef78d1c7..26c93e045 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "@ckeditor/ckeditor5-vue": "^4.0.1", "@symfony/webpack-encore": "^4.1.0", "@tsconfig/node14": "^1.0.1", + "@types/dompurify": "^3.0.5", "bindings": "^1.5.0", - "bootstrap": "^5.3.0", "chokidar": "^3.5.1", "fork-awesome": "^1.1.7", "jquery": "^3.6.0", @@ -31,10 +31,10 @@ "typescript": "^4.7.2", "vue-loader": "^17.0.0", "webpack": "^5.75.0", - "webpack-cli": "^5.0.1", - "@types/dompurify": "^3.0.5" + "webpack-cli": "^5.0.1" }, "dependencies": { + "bootstrap": "~5.2.0", "@fullcalendar/core": "^6.1.4", "@fullcalendar/daygrid": "^6.1.4", "@fullcalendar/interaction": "^6.1.4", @@ -43,9 +43,11 @@ "@fullcalendar/vue3": "^6.1.4", "@popperjs/core": "^2.9.2", "@types/leaflet": "^1.9.3", + "dompurify": "^3.0.6", "dropzone": "^5.7.6", "es6-promise": "^4.2.8", "leaflet": "^1.7.1", + "marked": "^9.1.5", "masonry-layout": "^4.2.2", "mime": "^3.0.0", "swagger-ui": "^4.15.5", @@ -54,9 +56,7 @@ "vue-i18n": "^9.1.6", "vue-multiselect": "3.0.0-alpha.2", "vue-toast-notification": "^2.0", - "vuex": "^4.0.0", - "dompurify": "^3.0.6", - "marked": "^9.1.5" + "vuex": "^4.0.0" }, "browserslist": [ "Firefox ESR" diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss index feca44382..96da20779 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss @@ -11,7 +11,6 @@ // 3. Include remainder of required Bootstrap stylesheets @import "bootstrap/scss/variables"; -@import "bootstrap/scss/variables-dark"; // 4. Include any default map overrides here @import "custom/_maps";