From d56859407bb9dea55c4265630c616fb8f7454e24 Mon Sep 17 00:00:00 2001 From: JAGFx Date: Fri, 29 Jul 2022 20:24:08 +0200 Subject: [PATCH] :arrow_down: #133 downgrade bootstrap to 5.1 --- package-lock.json | 34 +++++++++---------- package.json | 2 +- .../vendors/_bootstrap_configuration.scss | 4 +-- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5843cbb..806ed51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@fortawesome/vue-fontawesome": "^3.0.1", "@vue/compat": "^3.2.37", "axios": "^0.27.2", - "bootstrap": "^5.2.0", "core-js": "^3.23.5", "country-list": "^2.2.0", "emoji-flag": "^1.1.0", @@ -49,6 +48,7 @@ "@vue/compiler-sfc": "^3.2.37", "@vue/vue3-jest": "^28.0.1", "babel-jest": "^28.1.3", + "bootstrap": "~5.1", "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", @@ -2816,6 +2816,7 @@ "version": "2.11.5", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==", + "dev": true, "peer": true, "funding": { "type": "opencollective", @@ -5315,21 +5316,16 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz", - "integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/twbs" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - } - ], + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + }, "peerDependencies": { - "@popperjs/core": "^2.11.5" + "@popperjs/core": "^2.10.2" } }, "node_modules/brace-expansion": { @@ -24603,6 +24599,7 @@ "version": "2.11.5", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==", + "dev": true, "peer": true }, "@rollup/pluginutils": { @@ -26644,9 +26641,10 @@ "dev": true }, "bootstrap": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz", - "integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", + "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", + "dev": true, "requires": {} }, "brace-expansion": { diff --git a/package.json b/package.json index d4e7886..5f9402f 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "@fortawesome/vue-fontawesome": "^3.0.1", "@vue/compat": "^3.2.37", "axios": "^0.27.2", - "bootstrap": "^5.2.0", "core-js": "^3.23.5", "country-list": "^2.2.0", "emoji-flag": "^1.1.0", @@ -76,6 +75,7 @@ "@vue/compiler-sfc": "^3.2.37", "@vue/vue3-jest": "^28.0.1", "babel-jest": "^28.1.3", + "bootstrap": "~5.1", "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", diff --git a/src/application/style/vendors/_bootstrap_configuration.scss b/src/application/style/vendors/_bootstrap_configuration.scss index d045486..7d33a06 100644 --- a/src/application/style/vendors/_bootstrap_configuration.scss +++ b/src/application/style/vendors/_bootstrap_configuration.scss @@ -2,7 +2,7 @@ @import "../abstracts/variables"; @import "../abstracts/mixins"; -@import "bootstrap/scss/mixins/banner"; +//@import "bootstrap/scss/mixins/banner"; @import "bootstrap/scss/functions"; // Custom variables @@ -39,6 +39,6 @@ $enable-shadows: false; // Configuration @import "bootstrap/scss/variables"; -@import "bootstrap/scss/maps"; +//@import "bootstrap/scss/maps"; @import "bootstrap/scss/mixins"; @import "bootstrap/scss/utilities"; \ No newline at end of file