Skip to content

Commit 9dd1373

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into dependabot/npm_and_yarn/eslint-plugin-jest-24.1.2
2 parents e3b3bb3 + 1b5617c commit 9dd1373

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Released: 2020-11-08
2323
[#5958](https://github.com/bootstrap-vue/bootstrap-vue/issues/5958))
2424
([#5981](https://github.com/bootstrap-vue/bootstrap-vue/issues/5981))
2525
([7ea0cc4](https://github.com/bootstrap-vue/bootstrap-vue/commit/7ea0cc4a16d27b179eca47d351eaa9fe6fdfd56e))
26+
- **icons:** update Bootstrap Icons to v1.1.0
27+
([#5977](https://github.com/bootstrap-vue/bootstrap-vue/issues/5977))
28+
([8e45ad4](https://github.com/bootstrap-vue/bootstrap-vue/commit/8e45ad4d2d62c667113fe85db4fd755821c2eada))
2629

2730
### Bug Fixes v2.19.0
2831

@@ -190,6 +193,9 @@ Released: 2020-09-13
190193
- **docs:** auto-detect settings props in component reference
191194
([#5761](https://github.com/bootstrap-vue/bootstrap-vue/issues/5761))
192195
([0ddb2e0](https://github.com/bootstrap-vue/bootstrap-vue/commit/0ddb2e051c0ce42bdd599415ba93e82e1a6584f1))
196+
- **icons:** update Bootstrap Icons to v1.0.0
197+
([#5708](https://github.com/bootstrap-vue/bootstrap-vue/issues/5708))
198+
([edc2d35](https://github.com/bootstrap-vue/bootstrap-vue/commit/edc2d35dfc3eb9a550517b10e18f53673670e145))
193199

194200
### Bug Fixes v2.17.0
195201

@@ -277,6 +283,9 @@ Released: 2020-07-27
277283
- **docs:** launch themes page with first BootstrapVue theme
278284
([#5549](https://github.com/bootstrap-vue/bootstrap-vue/issues/5549))
279285
([ec51ef0](https://github.com/bootstrap-vue/bootstrap-vue/commit/ec51ef062f7ed39339cde59b2d9d4cee40347dcc))
286+
- **icons:** update Bootstrap Icons to v1.0.0-alpha5
287+
([#5533](https://github.com/bootstrap-vue/bootstrap-vue/issues/5533))
288+
([d52ce0b](https://github.com/bootstrap-vue/bootstrap-vue/commit/d52ce0bd400e94c9a7c99787356e7c277e8d8f0c))
280289

281290
### Bug Fixes v2.16.0
282291

@@ -316,7 +325,7 @@ Released: 2020-05-22
316325
- **css:** update Bootstrap to v4.5.0
317326
([#5395](https://github.com/bootstrap-vue/bootstrap-vue/issues/5395))
318327
([ba7a55e](https://github.com/bootstrap-vue/bootstrap-vue/commit/ba7a55ea094049fd1e3ae492a5a95196252b1da9))
319-
- **icons:** upgrade to Bootstrap Icons 1.0.0-alpha4
328+
- **icons:** update Bootstrap Icons to v1.0.0-alpha4
320329
([#5420](https://github.com/bootstrap-vue/bootstrap-vue/issues/5420))
321330
([3208309](https://github.com/bootstrap-vue/bootstrap-vue/commit/3208309c649b4cce73c68643d7c911237a713ebc))
322331
- **b-sidebar:** add prop `backdrop-variant`
@@ -663,7 +672,7 @@ Released: 2020-03-22
663672

664673
### Features v2.8.0
665674

666-
- **icons:** upgrade to Bootstrap Icons `1.0.0.alpha3`
675+
- **icons:** update Bootstrap Icons to v1.0.0.alpha3
667676
([#4966](https://github.com/bootstrap-vue/bootstrap-vue/issues/4966))
668677
([d481365](https://github.com/bootstrap-vue/bootstrap-vue/commit/d481365c9f8014e1573026881c3588f2d51999ee))
669678
- 200+ new icons

‎docs/content/themes/dexam-startup-and-product-landing-page.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: 'Dexam - Startup & Product Landing Page'
22
type: 'landing page'
33
category: 'Landing Page'
4-
img: 'https://raw.githubusercontent.com/mh-rafi/vue-landing/master/preview.png?token=ADAAYN6HJGIO53OHN7MX3SC7VERDM'
4+
img: 'https://i.ibb.co/1MyVr6S/preview-dexam.png'
55
href: 'https://1.envato.market/rVP4d'
66
description: 'Dexam is a clean startup and product landing page built with Vue Cli and BootstrapVue. It comes with 10+ home and colors variations. A HTML version is included.'
77
provider: 'UI Lib'

‎docs/content/themes/gull-admin-dashboard.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: 'Gull - Admin Dashboard'
22
type: 'dashboard'
33
category: 'Admin & Dashboard'
4-
img: 'https://raw.githubusercontent.com/mh-rafi/gull-vue/master/preview.png?token=ADAAYNYX54YEQFO4JSGDQHK7VEOBG'
4+
img: 'https://i.ibb.co/bRH1NN5/preview-gull.png'
55
href: 'https://1.envato.market/ayXRq'
66
description: 'Gull is a modern, next-generation Vue.js Admin Dashboard. It is feature-rich, responsive and built on top of Vue CLI, Vuex, Vue Router and BootstrapVue. If you want to create a Vue.js Admin Dashboard, Gull is best option.'
77
provider: 'UI Lib'

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"rollup-plugin-commonjs": "^10.1.0",
150150
"rollup-plugin-node-resolve": "^5.2.0",
151151
"sass": "^1.29.0",
152-
"sass-loader": "^10.0.5",
152+
"sass-loader": "^10.1.0",
153153
"standard-version": "^9.0.0",
154154
"terser": "^5.3.8",
155155
"vue": "^2.6.12",

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12212,10 +12212,10 @@ sane@^4.0.3:
1221212212
minimist "^1.1.1"
1221312213
walker "~1.0.5"
1221412214

12215-
sass-loader@^10.0.5:
12216-
version "10.0.5"
12217-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769"
12218-
integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w==
12215+
sass-loader@^10.1.0:
12216+
version "10.1.0"
12217+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.0.tgz#1727fcc0c32ab3eb197cda61d78adf4e9174a4b3"
12218+
integrity sha512-ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==
1221912219
dependencies:
1222012220
klona "^2.0.4"
1222112221
loader-utils "^2.0.0"

0 commit comments

Comments
 (0)