8000 Merge branch 'dev' into fix-utility-classes · bootstrap-vue/bootstrap-vue@e03f7d0 · GitHub
[go: up one dir, main page]
Skip to content

Commit e03f7d0

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into fix-utility-classes
2 parents ffee170 + 5e82e7f commit e03f7d0

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎docs/markdown/reference/theming/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
> Theming is accomplished by Sass variables, Sass maps, and custom CSS. There's no dedicated theme
44
> stylesheet; instead, you can enable the built-in theme to add gradients, shadows, and more.
55
6-
While BootstrapVue uses Bootstrap's CSS, certain features of BootstrapVue uses custom CSS (i.e.
6+
While BootstrapVue uses Bootstrap's CSS, certain features of BootstrapVue use custom CSS (i.e.
77
stacked tables, etc.). Our custom CSS relies on variables defined the Bootstrap v4.x SCSS. The
88
`bootstrap-vue/dist/bootstrap-vue.css` is compiled using the default Bootstrap v4.x variables. By
99
using the BootstrapVue source SCSS, you can have your variable overrides (such as breakpoints, theme

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@
116116
"codesandbox": "^2.2.1",
117117
"core-js": "^3.6.5",
118118
"cross-env": "^7.0.2",
119-
"eslint": "^7.12.0",
120-
"eslint-config-prettier": "^6.14.0",
121-
"eslint-config-standard": "^15.0.0",
119+
"eslint": "^7.12.1",
120+
"eslint-config-prettier": "^6.15.0",
121+
"eslint-config-standard": "^15.0.1",
122122
"eslint-config-vue": "^2.0.2",
123123
"eslint-plugin-import": "^2.22.1",
124124
"eslint-plugin-jest": "^24.1.0",
@@ -135,7 +135,7 @@
135135
"husky": "^4.3.0",
136136
"improved-yarn-audit": "^2.3.1",
137137
"jest": "^26.6.1",
138-
"lint-staged": "^10.4.2",
138+
"lint-staged": "^10.5.0",
139139
"loader-utils": "^2.0.0",
140140
"lodash": "^4.17.20",
141141
"marked": "^1.2.2",

‎yarn.lock

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -919,10 +919,10 @@
919919
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
920920
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
921921

922-
"@eslint/eslintrc@^0.2.0":
923-
version "0.2.0"
924-
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.0.tgz#bc7e3c4304d4c8720968ccaee793087dfb5fe6b4"
925-
integrity sha512-+cIGPCBdLCzqxdtwppswP+zTsH9BOIGzAeKfBIbtb4gW/giMlfMwP0HUSFfhzh20f9u8uZ8hOp62+4GPquTbwQ==
922+
"@eslint/eslintrc@^0.2.1":
923+
version "0.2.1"
924+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
925+
integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
926926
dependencies:
927927
ajv "^6.12.4"
928928
debug "^4.1.1"
@@ -5523,17 +5523,17 @@ escodegen@^1.14.1:
55235523
optionalDependencies:
55245524
source-map "~0.6.1"
55255525

5526-
eslint-config-prettier@^6.14.0:
5527-
version "6.14.0"
5528-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.14.0.tgz#390e7863a8ae99970981933826476169285b3a27"
5529-
integrity sha512-DbVwh0qZhAC7CNDWcq8cBdK6FcVHiMTKmCypOPWeZkp9hJ8xYwTaWSa6bb6cjfi8KOeJy0e9a8Izxyx+O4+gCQ==
5526+
eslint-config-prettier@^6.15.0:
5527+
version "6.15.0"
5528+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
5529+
integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
55305530
dependencies:
55315531
get-stdin "^6.0.0"
55325532

5533-
eslint-config-standard@^15.0.0:
5534-
version "15.0.0"
5535-
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-15.0.0.tgz#459f823b47ac0541b0a22b1d0a161a9da543f687"
5536-
integrity sha512-MZ8KRhUJLtMbjQo9PsEzFG29vqbQJfLoLBHrTaAaFMtDx9PIm1GZgyUanOLgf1xOE1aWrtZZSbxBYCy8dJCCBg==
5533+
eslint-config-standard@^15.0.1:
5534+
version "15.0.1"
5535+
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-15.0.1.tgz#1262eafaba66f4f03fdf3cf655a28aa8b40868b7"
5536+
integrity sha512-UGorkix49kBium7Y124o2U9Qy7Lpa+nO0FsaqQSIPeno5hGNxZtSBJbqJX6gtpYfDFWCtqCAN9wyK+oDd9jT7Q==
55375537

55385538
eslint-config-vue@^2.0.2:
55395539
version "2.0.2"
@@ -5671,13 +5671,13 @@ eslint-visitor-keys@^2.0.0:
56715671
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
56725672
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
56735673

5674-
eslint@^7.12.0:
5675-
version "7.12.0"
5676-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.0.tgz#7b6a85f87a9adc239e9 8000 79bb721cde5ce0dc27da6"
5677-
integrity sha512-n5pEU27DRxCSlOhJ2rO57GDLcNsxO0LPpAbpFdh7xmcDmjmlGUfoyrsB3I7yYdQXO5N3gkSTiDrPSPNFiiirXA==
5674+
eslint@^7.12.1:
5675+
version "7.12.1"
5676+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.1.tgz#bd9a81fa67a6cfd51656cdb88812ce49ccec5801"
5677+
integrity sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==
56785678
dependencies:
56795679
"@babel/code-frame" "^7.0.0"
5680-
"@eslint/eslintrc" "^0.2.0"
5680+
"@eslint/eslintrc" "^0.2.1"
56815681
ajv "^6.10.0"
56825682
chalk "^4.0.0"
56835683
cross-spawn "^7.0.2"
@@ -8705,10 +8705,10 @@ lines-and-columns@^1.1.6:
87058705
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
87068706
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
87078707

8708-
lint-staged@^10.4.2:
8709-
version "10.4.2"
8710-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.4.2.tgz#9fee4635c4b5ddb845746f237c6d43494ccd21c1"
8711-
integrity sha512-OLCA9K1hS+Sl179SO6kX0JtnsaKj/MZalEhUj5yAgXsb63qPI/Gfn6Ua1KuZdbfkZNEu3/n5C/obYCu70IMt9g==
8708+
lint-staged@^10.5.0:
8709+
version "10.5.0"
8710+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.0.tgz#c923c2447a84c595874f3de696778736227e7a7a"
8711+
integrity sha512-gjC9+HGkBubOF+Yyoj9pd52Qfm/kYB+dRX1UOgWjHKvSDYl+VHkZXlBMlqSZa2cH3Kp5/uNL480sV6e2dTgXSg==
87128712
dependencies:
87138713
chalk "^4.1.0"
87148714
cli-truncate "^2.1.0"

0 commit comments

Comments
 (0)
0