From 2c1948ba1a8d9769b364f4aef8d457579b252050 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Fri, 30 Jul 2021 12:31:35 -0400 Subject: [PATCH] upgrade bootstrap --- package.json | 2 +- src/theme.css | 3 +-- yarn.lock | 21 ++++----------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 88098bd..47a8e03 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "test:tdd": "yarn test --watch" }, "dependencies": { - "bootstrap": "4.0.0-alpha.4", + "bootstrap": "^4.0.0", "lit": "^2.0.0-rc.2", "lit-redux-router": "~0.19.0", "pwa-helpers": "^0.9.1", diff --git a/src/theme.css b/src/theme.css index 043cdfb..d18dbe4 100644 --- a/src/theme.css +++ b/src/theme.css @@ -1,5 +1,4 @@ -/* @import "../node_modules/bootstrap/dist/css/bootstrap.css"; */ -@import "../node_modules/bootstrap/scss/bootstrap-flex.scss"; +@import "../node_modules/bootstrap/scss/bootstrap.scss"; :root { /* raw tokens */ diff --git a/yarn.lock b/yarn.lock index a64e5e4..04cbd5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3671,13 +3671,10 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap@4.0.0-alpha.4: - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.4.tgz#823cb353d6c50a38df98aa18ec4df56ef0355e7a" - integrity sha1-gjyzU9bFCjjfmKoY7E31bvA1Xno= - dependencies: - jquery "1.9.1 - 3" - tether "^1.1.1" +bootstrap@^4.0.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" + integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== boxen@^4.2.0: version "4.2.0" @@ -7581,11 +7578,6 @@ jest-worker@^26.2.1, jest-worker@^26.5.0, jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -"jquery@1.9.1 - 3": - version "3.6.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" - integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== - js-string-escape@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" @@ -12005,11 +11997,6 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" -tether@^1.1.1: - version "1.4.7" - resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.7.tgz#d56a818590d8fe72e387f77a67f93ab96d8e1fb2" - integrity sha512-Z0J1aExjoFU8pybVkQAo/vD2wfSO63r+XOPfWQMC5qtf1bI7IWqNk4MiyBcgvvnY8kqnY06dVdvwTK2S3PU/Fw== - text-table@0.2.0, text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"