8000 Merge branch 'dev' into fix-form-group-markup · bootstrap-vue/bootstrap-vue@5011d4c · GitHub
[go: up one dir, main page]
Skip to content

Commit 5011d4c

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into fix-form-group-markup
2 parents c643735 + c381460 commit 5011d4c

File tree

9 files changed

+4576
-1374
lines changed

9 files changed

+4576
-1374
lines changed

‎.bundlewatch.config.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
"files": [
33
{
44
"path": "./dist/bootstrap-vue-icons.js",
5-
"maxSize": "120 kB"
5+
"maxSize": "130 kB"
66
},
77
{
88
"path": "./dist/bootstrap-vue-icons.min.js",
9-
"maxSize": "110 kB"
9+
"maxSize": "120 kB"
1010
},
1111
{
1212
"path": "./dist/bootstrap-vue-icons.common.js",
13-
"maxSize": "120 kB"
13+
"maxSize": "130 kB"
1414
},
1515
{
1616
"path": "./dist/bootstrap-vue-icons.common.min.js",
17-
"maxSize": "110 kB"
17+
"maxSize": "120 kB"
1818
},
1919
{
2020
"path": "./dist/bootstrap-vue-icons.esm.js",
21-
"maxSize": "120 kB"
21+
"maxSize": "130 kB"
2222
},
2323
{
2424
"path": "./dist/bootstrap-vue-icons.esm.min.js",
25-
"maxSize": "110 kB"
25+
"maxSize": "120 kB"
2626
},
2727
{
2828
"path": "./dist/bootstrap-vue-icons.css",
@@ -42,19 +42,19 @@
4242
},
4343
{
4444
"path": "./dist/bootstrap-vue.common.js",
45-
"maxSize": "325 kB"
45+
"maxSize": "330 kB"
4646
},
4747
{
4848
"path": "./dist/bootstrap-vue.common.min.js",
49-
"maxSize": "200 kB"
49+
"maxSize": "205 kB"
5050
},
5151
{
5252
"path": "./dist/bootstrap-vue.esm.js",
53-
"maxSize": "325 kB"
53+
"maxSize": "330 kB"
5454
},
5555
{
5656
"path": "./dist/bootstrap-vue.esm.min.js",
57-
"maxSize": "200 kB"
57+
"maxSize": "205 kB"
5858
},
5959
{
6060
"path": "./dist/bootstrap-vue.css",

‎docs/content.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const directives = importAll(directivesContext)
99

1010
const iconsContext = require.context('~/../src/icons', false, /package.json/)
1111
const icons = importAll(iconsContext) || {}
12-
// Since there are over 300 icons, we only return `BIcon` and `BIconstack` component, plus
12+
// Since there a lot of icons, we only return `BIcon` and `BIconstack` component, plus
1313
// one extra example icon component which we modify the icon name to be `BIcon{IconName}`
1414
// We sort the array to ensure `BIcon` appears first
1515
icons[''].components = icons[''].components
@@ -73,7 +73,7 @@ export const bootstrapVersionMajor = bootstrapVersion.replace(majorRE, '$1')
7373
export const bootstrapIconsVersion = parseFullVersion(devDependencies['bootstrap-icons'])
7474
export const bootstrapIconsVersionMinor = bootstrapIconsVersion.replace(minorRE, '$1')
7575
export const bootstrapIconsVersionMajor = bootstrapIconsVersion.replace(majorRE, '$1')
76-
export const bootstrapIconsCount = 1100
76+
export const bootstrapIconsCount = 1200
7777

7878
export const popperVersion = parseVersion(dependencies['popper.js'])
7979
export const popperVersionMinor = popperVersion.replace(minorRE, '$1')

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"babel-eslint": "^10.1.0",
110110
"babel-jest": "^26.6.3",
111111
"babel-plugin-istanbul": "^6.0.0",
112-
"bootstrap-icons": "^1.1.0",
112+
"bootstrap-icons": "^1.2.0",
113113
"bundlewatch": "^0.3.1",
114114
"clean-css-cli": "^4.3.0",
115115
"codemirror": "^5.58.3",

‎src/icons/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ installed by default. You do not need `bootstrap-icons` as a dependency.
2121
added in BootstrapVue `v2.17.0`.
2222
- [Bootstrap Icons `v1.1.0`](https://blog.getbootstrap.com/2020/10/28/bootstrap-icons-1-1-0/) were
2323
added in BootstrapVue `v2.19.0`.
24+
- [Bootstrap Icons `v1.2.0`](https://blog.getbootstrap.com/2020/12/11/bootstrap-icons-1-2-0/) were
25+
added in BootstrapVue `v2.21.0`.
2426

2527
## Usage
2628

‎src/icons/icons.d.ts

Lines changed: 102 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// --- BEGIN AUTO-GENERATED FILE ---
22
//
3-
// @IconsVersion: 1.1.0
4-
// @Generated: 2020-10-28T19:03:32.056Z
3+
// @IconsVersion: 1.2.0
4+
// @Generated: 2020-12-11T21:46:26.103Z
55
//
66
// This file is generated on each build. Do not edit this file!
77

@@ -928,6 +928,12 @@ export declare class BIconDice6 extends BvComponent {}
928928

929929
export declare class BIconDice6Fill extends BvComponent {}
930930

931+
export declare class BIconDisc extends BvComponent {}
932+
933+
export declare class BIconDiscFill extends BvComponent {}
934+
935+
export declare class BIconDiscord extends BvComponent {}
936+
931937
export declare class BIconDisplay extends BvComponent {}
932938

933939
export declare class BIconDisplayFill extends BvComponent {}
@@ -1056,6 +1062,8 @@ export declare class BIconEyeSlashFill extends BvComponent {}
10561062

10571063
export declare class BIconEyeglasses extends BvComponent {}
10581064

1065+
export declare class BIconFacebook extends BvComponent {}
1066+
10591067
export declare class BIconFile extends BvComponent {}
10601068

10611069
export declare class BIconFileArrowDown extends BvComponent {}
@@ -1392,10 +1400,14 @@ export declare class BIconGift extends BvComponent {}
13921400

13931401
export declare class BIconGiftFill extends BvComponent {}
13941402

1403+
export declare class BIconGithub extends BvComponent {}
1404+
13951405
export declare class BIconGlobe extends BvComponent {}
13961406

13971407
export declare class BIconGlobe2 extends BvComponent {}
13981408

1409+
export declare class BIconGoogle extends BvComponent {}
1410+
13991411
export declare class BIconGraphDown extends BvComponent {}
14001412

14011413
export declare class BIconGraphUp extends BvComponent {}
@@ -1526,6 +1538,8 @@ export declare class BIconInputCursor extends BvComponent {}
15261538

15271539
export declare class BIconInputCursorText extends BvComponent {}
15281540

1541+
export declare class BIconInstagram extends BvComponent {}
1542+
15291543
export declare class BIconIntersect extends BvComponent {}
15301544

15311545
export declare class BIconJournal extends BvComponent {}
@@ -1626,6 +1640,8 @@ export declare class BIconLink extends BvComponent {}
16261640

16271641
export declare class BIconLink45deg extends BvComponent {}
16281642

1643+
export declare class BIconLinkedin extends BvComponent {}
1644+
16291645
export declare class BIconList extends BvComponent {}
16301646

16311647
export declare class BIconListCheck extends BvComponent {}
@@ -1752,6 +1768,14 @@ export declare class BIconPatchQuestionFll extends BvComponent {}
17521768

17531769
export declare class BIconPause extends BvComponent {}
17541770

1771+
export declare class BIconPauseBtn extends BvComponent {}
1772+
1773+
export declare class BIconPauseBtnFill extends BvComponent {}
1774+
1775+
export declare class BIconPauseCircle extends BvComponent {}
1776+
1777+
export declare class BIconPauseCircleFill extends BvComponent {}
1778+
17551779
export declare class BIconPauseFill extends BvComponent {}
17561780

17571781
export declare class BIconPeace extends BvComponent {}
@@ -1832,6 +1856,14 @@ export declare class BIconPipFill extends BvComponent {}
18321856

18331857
export declare class BIconPlay extends BvComponent {}
18341858

1859+
export declare class BIconPlayBtn extends BvComponent {}
1860+
1861+
export declare class BIconPlayBtnFill extends BvComponent {}
1862+
1863+
export declare class BIconPlayCircle extends BvComponent {}
1864+
1865+
export declare class BIconPlayCircleFill extends BvComponent {}
1866+
18351867
export declare class BIconPlayFill extends BvComponent {}
18361868

18371869
export declare class BIconPlug extends BvComponent {}
@@ -1890,6 +1922,22 @@ export declare class BIconReception3 extends BvComponent {}
18901922

18911923
export declare class BIconReception4 extends BvComponent {}
18921924

1925+
export declare class BIconRecord extends BvComponent {}
1926+
1927+
export declare class BIconRecord2 extends BvComponent {}
1928+
1929+
export declare class BIconRecord2Fill extends BvComponent {}
1930+
1931+
export declare class BIconRecordBtn extends BvComponent {}
1932+
1933+
export declare class BIconRecordBtnFill extends BvComponent {}
1934+
1935+
export declare class BIconRecordCircle extends BvComponent {}
1936+
1937+
export declare class BIconRecordCircleFill extends BvComponent {}
1938+
1939+
export declare class BIconRecordFill extends BvComponent {}
1940+
18931941
export declare class BIconReply extends BvComponent {}
18941942

18951943
export declare class BIconReplyAll extends BvComponent {}
@@ -1978,20 +2026,54 @@ export declare class BIconSimFill extends BvComponent {}
19782026

19792027
export declare class BIconSkipBackward extends BvComponent {}
19802028

2029+
export declare class BIconSkipBackwardBtn extends BvComponent {}
2030+
2031+
export declare class BIconSkipBackwardBtnFill extends BvComponent {}
2032+
2033+
export declare class BIconSkipBackwardCircle extends BvComponent {}
2034+
2035+
export declare class BIconSkipBackwardCircleFill extends BvComponent {}
2036+
19812037
export declare class BIconSkipBackwardFill extends BvComponent {}
19822038

19832039
export declare class BIconSkipEnd extends BvComponent {}
19842040

2041+
export declare class BIconSkipEndBtn extends BvComponent {}
2042+
2043+
export declare class BIconSkipEndBtnFill extends BvComponent {}
2044+
2045+
export declare class BIconSkipEndCircle extends BvComponent {}
2046+
2047+
export declare class BIconSkipEndCircleFill extends BvComponent {}
2048+
19852049
export declare class BIconSkipEndFill extends BvComponent {}
19862050

19872051
export declare class BIconSkipForward extends BvComponent {}
19882052

2053+
export declare class BIconSkipForwardBtn extends BvComponent {}
2054+
2055+
export declare class BIconSkipForwardBtnFill extends BvComponent {}
2056+
2057+
export declare class BIconSkipForwardCircle extends BvComponent {}
2058+
2059+
export declare class BIconSkipForwardCircleFill extends BvComponent {}
2060+
19892061
export declare class BIconSkipForwardFill extends BvComponent {}
19902062

19912063
export declare class BIconSkipStart extends BvComponent {}
19922064

2065+
export declare class BIconSkipStartBtn extends BvComponent {}
2066+
2067+
export declare class BIconSkipStartBtnFill extends BvComponent {}
2068+
2069+
export declare class BIconSkipStartCircle extends BvComponent {}
2070+
2071+
export declare class BIconSkipStartCircleFill extends BvComponent {}
2072+
19932073
export declare class BIconSkipStartFill extends BvComponent {}
19942074

2075+
export declare class BIconSlack extends BvComponent {}
2076 10000 +
19952077
export declare class BIconSlash extends BvComponent {}
19962078

19972079
export declare class BIconSlashCircle extends BvComponent {}
@@ -2060,6 +2142,14 @@ export declare class BIconStickyFill extends BvComponent {}
20602142

20612143
export declare class BIconStop extends BvComponent {}
20622144

2145+
export declare class BIconStopBtn extends BvComponent {}
2146+
2147+
export declare class BIconStopBtnFill extends BvComponent {}
2148+
2149+
export declare class BIconStopCircle extends BvComponent {}
2150+
2151+
export declare class BIconStopCircleFill extends BvComponent {}
2152+
20632153
export declare class BIconStopFill extends BvComponent {}
20642154

20652155
export declare class BIconStoplights extends BvComponent {}
@@ -2212,6 +2302,10 @@ export declare class BIconTv extends BvComponent {}
22122302

22132303
export declare class BIconTvFill extends BvComponent {}
22142304

2305+
export declare class BIconTwitch extends BvComponent {}
2306+
2307+
export declare class BIconTwitter extends BvComponent {}
2308+
22152309
export declare class BIconType extends BvComponent {}
22162310

22172311
export declare class BIconTypeBold extends BvComponent {}
@@ -2254,6 +2348,10 @@ export declare class BIconViewList extends BvComponent {}
22542348

22552349
export declare class BIconViewStacked extends BvComponent {}
22562350

2351+
export declare class BIconVinyl extends BvComponent {}
2352+
2353+
export declare class BIconVinylFill extends BvComponent {}
2354+
22572355
export declare class BIconVoicemail extends BvComponent {}
22582356

22592357
export declare class BIconVolumeDown extends BvComponent {}
@@ -2312,6 +2410,8 @@ export declare class BIconXSquare extends BvComponent {}
23122410

23132411
export declare class BIconXSquareFill extends BvComponent {}
23142412

2413+
export declare class BIconYoutube extends BvComponent {}
2414+
23152415
export declare class BIconZoomIn extends BvComponent {}
23162416

23172417
export declare class BIconZoomOut extends BvComponent {}

0 commit comments

Comments
 (0)
0