diff --git a/package.json b/package.json index 02958b6151171fa7af58e694c53964e315480f13..5f02de326f479b0f8baca4499d9fc87edfdcb8d0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "dependencies": { "@babel/standalone": "^7.0.0", "@gitlab/vue-toasted": "^1.3.0", - "bootstrap-vue": "2.1.0", + "bootstrap-vue": "2.13.1", "copy-to-clipboard": "^3.0.8", "echarts": "^4.2.1", "highlight.js": "^9.13.1", @@ -73,7 +73,7 @@ }, "peerDependencies": { "@gitlab/svgs": "^1.116.0", - "bootstrap": "4.3.1", + "bootstrap": "4.4.1", "pikaday": "^1.8.0", "vue": "^2.6.10" }, @@ -99,7 +99,7 @@ "babel-loader": "^8.0.5", "babel-plugin-require-context-hook": "^1.0.0", "babel-preset-vue": "^2.0.2", - "bootstrap": "4.3.1", + "bootstrap": "4.4.1", "eslint": "^6.8.0", "eslint-import-resolver-jest": "^3.0.0", "file-loader": "^4.2.0", diff --git a/src/components/base/form/form_input/form_input.scss b/src/components/base/form/form_input/form_input.scss index e56e572b391d7ebc5fa83f08e596c224803e4296..3fd6f5f7619ba6c9e99112e0229e8572a107a87b 100644 --- a/src/components/base/form/form_input/form_input.scss +++ b/src/components/base/form/form_input/form_input.scss @@ -10,7 +10,7 @@ @include gl-text-gray-900; @include gl-inset-border-1-gray-400; @include gl-border-none; - @include form-control-focus; + @include form-control-focus($ignore-warning: true); @include gl-appearance-none; &:disabled, diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-opened-modal-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-opened-modal-1-snap.png index e2a713d62cf0c88567ce70298acc0192f3792252..c4744ca9d314dc5a28c0a53be7be499bb8f25cda 100644 Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-opened-modal-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-opened-modal-1-snap.png differ diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-default-1-snap.png index a204cecd06a0171f0608aaac3debd35c12ef93a6..a3333c3a76b8ab233aea26f8b93a92cf1f1966d9 100644 Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-default-1-snap.png differ diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-no-filter-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-no-filter-1-snap.png index ca92e54790db70738d25a9b920a4f7782d07b13b..eded4a912fddcc6ec304c63e4d1d834e6d2b2a78 100644 Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-no-filter-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-no-filter-1-snap.png differ diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png index 8f39eea2fd4e217689f61005ddd9277c36b07470..43cf346adc522d955b57bcc092df2b38b22e26de 100644 Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png differ diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png index 83a24325583f3fd504f230672cb38a544b62e87c..93478ad1bc7118d203d966001481e35addbdf90a 100644 Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png differ diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-subheader-slot-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-subheader-slot-1-snap.png index df1ddcad4ce96b283b5b128635ad741e778ce252..015fb93c32d74f791cb2de40096063f6fe26b78b 100644 Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-subheader-slot-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-subheader-slot-1-snap.png differ diff --git a/yarn.lock b/yarn.lock index a2d36efee43d713514eda211d2fffcbdc2a3130a..05a589eabbb5ad6aeaefc8f7f560970e6e6b538a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2990,21 +2990,26 @@ 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-vue@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz#41c0cd265a6cea14ffe29eeea71543ec396d1789" - integrity sha512-dftb5fc42x7QLv814nN+3Cx8MMuCB+xrGQjOmSXH81ET0+yo7KYb4lUN3/pOnf+8Tkv8oaawZ1OOth5/AZfktg== +bootstrap-vue@2.13.1: + version "2.13.1" + resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.13.1.tgz#dcefca78f2b0345508fbb85adb0a9897cce65fa1" + integrity sha512-FF1GLRvvj+TgpLkMG/A8+tCMQfWnfKpsPqt7s097VTX2lZv2/YmyhehRC1qraPHYqT7qQVy48TCxSw1H8hNh3Q== dependencies: "@nuxt/opencollective" "^0.3.0" - bootstrap ">=4.3.1 <5.0.0" - popper.js "^1.16.0" - portal-vue "^2.1.6" + bootstrap ">=4.4.1 <5.0.0" + popper.js "^1.16.1" + portal-vue "^2.1.7" vue-functional-data-merge "^3.1.0" -bootstrap@4.3.1, "bootstrap@>=4.3.1 <5.0.0": - version "4.3.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac" - integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag== +bootstrap@4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01" + integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA== + +"bootstrap@>=4.4.1 <5.0.0": + version "4.5.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec" + integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA== boxen@^1.2.1: version "1.3.0" @@ -10097,7 +10102,7 @@ polished@^3.3.1: dependencies: "@babel/runtime" "^7.4.5" -popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.16.0: +popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.16.1: version "1.16.1" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== @@ -10107,6 +10112,11 @@ portal-vue@^2.1.6: resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.6.tgz#a7d4790b14a79af7fd159a60ec88c30cddc6c639" integrity sha512-lvCF85D4e8whd0nN32D8FqKwwkk7nYUI3Ku8UAEx4Z1reomu75dv5evRUTZNaj1EalxxWNXiNl0EHRq36fG8WA== +portal-vue@^2.1.7: + version "2.1.7" + resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4" + integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g== + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"