🌐 AI搜索 & 代理 主页
Skip to content

Commit c56cf40

Browse files
tmorehousetmorehouse
authored
chore: patch release v2.6.1
Merge pull request #4887 from bootstrap-vue/dev
2 parents 4203876 + 24e9b11 commit c56cf40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+531
-251
lines changed

‎CHANGELOG.md‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44
> [standard-version](https://github.com/conventional-changelog/standard-version) for commit
55
> guidelines.
66
7+
<a name="2.6.1"></a>
8+
9+
## [v2.6.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.6.0...v2.6.1)
10+
11+
Released: 2020-03-06
12+
13+
### Bug Fixes v2.6.1
14+
15+
- **b-form-spinbutton:** respect step value for initial decrement when `wrap` enabled (closes
16+
[#4884](https://github.com/bootstrap-vue/bootstrap-vue/issues/4884))
17+
([#4885](https://github.com/bootstrap-vue/bootstrap-vue/issues/4885))
18+
([28e7245](https://github.com/bootstrap-vue/bootstrap-vue/commit/28e724536be4762382328648f203bd46d8f52fdc))
19+
20+
### Other v2.6.1
21+
22+
- documentation updates and fixes
23+
- dev dependency updates
24+
725
<a name="2.6.0"></a>
826

927
## [v2.6.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.5.0...v2.6.0)
@@ -272,7 +290,7 @@ Released: 2020-01-08
272290
- **b-collapse:** add optional scoping to default slot
273291
([#4405](https://github.com/bootstrap-vue/bootstrap-vue/issues/4405))
274292
([8e95bac](https://github.com/bootstrap-vue/bootstrap-vue/commit/8e95bacf9d00562f2676689d067ae0db009cbbb6))
275-
- **b-container:** add support for bootstrap v4.4.x new responsive containers
293+
- **b-container:** add support for Bootstrap v4.4.x new responsive containers
276294
([0e318f4](https://github.com/bootstrap-vue/bootstrap-vue/commit/0e318f4755e65eb569dcc579938d0d72c02abd62))
277295
- **b-dropdown:** add splitClass property to dropdown component
278296
([#4394](https://github.com/bootstrap-vue/bootstrap-vue/issues/4394))
@@ -1932,7 +1950,7 @@ Released: 2019-02-18
19321950
([#2597](https://github.com/bootstrap-vue/bootstrap-vue/issues/2597))
19331951
([#2608](https://github.com/bootstrap-vue/bootstrap-vue/issues/2608))
19341952
([11c7524](https://github.com/bootstrap-vue/bootstrap-vue/commit/11c7524))
1935-
- **nuxt plugin:** fix typo with bootstrap vue css import properties
1953+
- **nuxt plugin:** fix typo with Bootstrap vue css import properties
19361954
([#2618](https://github.com/bootstrap-vue/bootstrap-vue/issues/2618))
19371955
([8581090](https://github.com/bootstrap-vue/bootstrap-vue/commit/8581090))
19381956
- **utils/get:** handle case where passed object is undefined
@@ -2011,7 +2029,7 @@ Released: (2019-02-14)
20112029
- **dependencies:** replace opencollective with opencollective-postinstall
20122030
([#2067](https://github.com/bootstrap-vue/bootstrap-vue/issues/2067))
20132031
([fa26882](https://github.com/bootstrap-vue/bootstrap-vue/commit/fa26882))
2014-
- **docs:** Update links to bootstrap v4.3 docs
2032+
- **docs:** Update links to Bootstrap v4.3 docs
20152033
([b5d5499](https://github.com/bootstrap-vue/bootstrap-vue/commit/b5d5499))
20162034
- **docs:** Button - fix typo ([#1962](https://github.com/bootstrap-vue/bootstrap-vue/issues/1962))
20172035
([dcbfcf9](https://github.com/bootstrap-vue/bootstrap-vue/commit/dcbfcf9))
@@ -2108,7 +2126,7 @@ Released: (2019-02-14)
21082126
[#1841](https://github.com/bootstrap-vue/bootstrap-vue/issues/1841)
21092127
([#2174](https://github.com/bootstrap-vue/bootstrap-vue/issues/2174))
21102128
([aacc7c0](https://github.com/bootstrap-vue/bootstrap-vue/commit/aacc7c0))
2111-
- **form-control:** remove interim class fixes from bootstrap 4.0.x
2129+
- **form-control:** remove interim class fixes from Bootstrap 4.0.x
21122130
([#1896](https://github.com/bootstrap-vue/bootstrap-vue/issues/1896))
21132131
([#2265](https://github.com/bootstrap-vue/bootstrap-vue/issues/2265))
21142132
([64bdf69](https://github.com/bootstrap-vue/bootstrap-vue/commit/64bdf69))

‎docs/assets/scss/styles.scss‎

Lines changed: 68 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
.hljs {
1616
overflow-x: auto;
17-
position: relative;
1817
background-color: #f9f9f9;
1918
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.125);
2019
}
@@ -137,42 +136,82 @@
137136
background-color: #eee;
138137
}
139138

140-
pre.editable {
141-
&::after {
142-
content: "(double click to edit)";
143-
position: absolute;
144-
top: 0;
145-
right: 0;
146-
color: #aaa;
147-
text-align: right;
148-
font-size: 0.75em;
149-
padding: 5px 10px 0;
150-
line-height: 15px;
151-
height: 15px;
152-
font-weight: 600;
153-
}
139+
.bd-code {
140+
position: relative;
154141

155-
&:hover {
142+
pre {
156143
&::after {
157-
font-size: 0.9em;
158-
color: #444;
159-
cursor: pointer;
144+
content: attr(data-filename);
145+
position: absolute;
146+
top: -7.5px;
147+
right: 0;
148+
color: #6c757d;
149+
text-align: right;
150+
font-size: 0.75em;
151+
line-height: 15px;
152+
font-weight: 600;
160153
}
161-
}
162154

163-
&.live {
164-
&::after {
165-
content: "Live";
155+
&.editable {
156+
&::after {
157+
content: "(Double click to edit)";
158+
top: 5px;
159+
right: 10px;
160+
}
161+
162+
&:hover {
163+
&::after {
164+
font-size: 0.85em;
165+
color: inherit;
166+
cursor: pointer;
167+
}
168+
}
169+
170+
&.live {
171+
&::after {
172+
content: "Live";
173+
}
174+
}
175+
176+
&.error {
177+
border: 1px solid #dc3545;
178+
box-shadow: 0 1px 1px rgba(220, 53, 69, 0.5);
179+
180+
&::after {
181+
content: "JavaScript compile error!";
182+
color: #dc3545;
183+
}
184+
}
166185
}
167186
}
187+
}
168188

169-
&.error {
170-
border: 1px solid #dc3545;
171-
box-shadow: 0 1px 1px rgba(220, 53, 69, 0.5);
189+
// Carbon Ad margin overrides
190+
.bv-ad {
191+
min-height: 130px;
192+
margin: 2rem 0;
172193

173-
&::after {
174-
content: "JavaScript compile error!";
175-
color: #dc3545;
194+
#carbonads {
195+
// Override Bootstrap v4 docs CSS ad margin
196+
margin: 0;
197+
}
198+
199+
// Margins for the home page ad
200+
@at-root .bv-section & {
201+
margin-bottom: 3rem;
202+
margin-top: 0;
203+
204+
#carbonads {
205+
// Center the ad on the home page
206+
margin-left: auto;
207+
margin-right: auto;
208+
}
209+
210+
@media (min-width: 768px) {
211+
& {
212+
margin-bottom: -1.5rem;
213+
margin-top: 3rem;
214+
}
176215
}
177216
}
178217
}

‎docs/components/ad.js‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
export default {
2+
name: 'BVAd',
3+
props: {
4+
id: {
5+
type: String,
6+
default: '_carbonads_js'
7+
},
8+
url: {
9+
type: String,
10+
default: '//cdn.carbonads.com/carbon.js'
11+
},
12+
serve: {
13+
type: String,
14+
default: 'CE7ITK77'
15+
},
16+
placement: {
17+
type: String,
18+
default: 'bootstrap-vuejsorg'
19+
}
20+
},
21+
computed: {
22+
src() {
23+
return `${this.url}?serve=${this.serve}&placement=${this.placement}`
24+
}
25+
},
26+
render(h) {
27+
return h('div', { staticClass: 'bv-ad' }, [
28+
h('client-only', [
29+
h('script', {
30+
attrs: {
31+
id: this.id,
32+
async: 'async',
33+
type: 'text/javascript',
34+
src: this.src
35+
}
36+
})
37+
])
38+
])
39+
}
40+
}

‎docs/components/anchored-heading.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { mergeData } from 'vue-functional-data-merge'
22

33
export default {
4-
name: 'BVDAnchoredHeading',
4+
name: 'BVAnchoredHeading',
55
functional: true,
66
props: {
77
id: {

docs/components/doc-breadcrumbs.vue renamed to docs/components/breadcrumbs.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const navLookup = nav.reduce((obj, section) => {
2222
}, {})
2323
2424
export default {
25-
name: 'BVDBreadcrumbs',
25+
name: 'BVBreadcrumbs',
2626
computed: {
2727
items() {
2828
const items = [{ text: 'Home', to: '/' }, { text: 'Docs', to: '/docs' }]

docs/components/codemirror.js renamed to docs/components/code-mirror.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
name: 'CodeMirror',
2+
name: 'BVCodeMirror',
33
props: {
44
value: {
55
type: String,

‎docs/components/componentdoc.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ import { kebabCase } from '../utils'
323323
import AnchoredHeading from './anchored-heading'
324324
325325
export default {
326-
name: 'BVDComponentdoc',
326+
name: 'BVComponentdoc',
327327
components: { AnchoredHeading },
328328
props: {
329329
component: {},

‎docs/components/contributors-container.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const CLASS_NAME = 'contributors-container'
44
const CONTRIBUTOR_CLASS_NAME = 'contributor'
55

66
export default {
7-
name: 'BVDContributorsContainer',
7+
name: 'BVContributorsContainer',
88
functional: true,
99
props: {
1010
type: {

‎docs/components/contributors.vue‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,61 @@
77
<!-- PLATINUM SPONSORS -->
88
<template v-if="platinumSponsors.length > 0">
99
<h4 class="h5 mx-auto mt-3 text-muted">Platinum Sponsors</h4>
10-
<BVDContributorsContainer
10+
<BVContributorsContainer
1111
type="platinum-sponsors"
1212
:contributors="platinumSponsors"
1313
:nofollow="false"
14-
></BVDContributorsContainer>
14+
></BVContributorsContainer>
1515
</template>
1616

1717
<!-- GOLD SPONSORS -->
1818
<template v-if="goldSponsors.length > 0">
1919
<h4 class="h5 mx-auto mt-3 text-muted">Gold Sponsors</h4>
20-
<BVDContributorsContainer
20+
<BVContributorsContainer
2121
type="gold-sponsors"
2222
:contributors="goldSponsors"
2323
:nofollow="false"
24-
></BVDContributorsContainer>
24+
></BVContributorsContainer>
2525
</template>
2626

2727
<!-- SILVER SPONSORS -->
2828
<template v-if="silverSponsors.length > 0">
2929
<h4 class="h5 mx-auto mt-3 text-muted">Silver Sponsors</h4>
30-
<BVDContributorsContainer
30+
<BVContributorsContainer
3131
type="silver-sponsors"
3232
:contributors="silverSponsors"
3333
:nofollow="false"
34-
></BVDContributorsContainer>
34+
></BVContributorsContainer>
3535
</template>
3636

3737
<!-- BRONZE SPONSORS -->
3838
<template v-if="bronzeSponsors.length > 0">
3939
<h4 class="h5 mx-auto mt-3 text-muted">Bronze Sponsors</h4>
40-
<BVDContributorsContainer
40+
<BVContributorsContainer
4141
type="bronze-sponsors"
4242
:contributors="bronzeSponsors"
4343
:nofollow="false"
44-
></BVDContributorsContainer>
44+
></BVContributorsContainer>
4545
</template>
4646
</template>
4747

4848
<!-- BACKERS -->
4949
<template v-if="backers.length > 0">
5050
<h3 class="h4 mx-auto mt-4 text-muted">Backers</h3>
51-
<BVDContributorsContainer
51+
<BVContributorsContainer
5252
type="backers"
5353
:contributors="backers"
54-
></BVDContributorsContainer>
54+
></BVContributorsContainer>
5555
</template>
5656

5757
<!-- DONORS -->
5858
<template v-if="donors.length > 0">
5959
<h3 class="h4 mx-auto mt-4 text-muted">Donors</h3>
60-
<BVDContributorsContainer
60+
<BVContributorsContainer
6161
type="donors"
6262
:contributors="donors"
6363
:show-name="false"
64-
></BVDContributorsContainer>
64+
></BVContributorsContainer>
6565
</template>
6666
</div>
6767
</template>
@@ -146,7 +146,7 @@
146146
</style>
147147

148148
<script>
149-
import BVDContributorsContainer from '~/components/contributors-container'
149+
import BVContributorsContainer from '~/components/contributors-container'
150150
151151
const OC_BASE_URL = 'https://rest.opencollective.com/v2/bootstrap-vue/orders/'
152152
const OC_DEFAULT_PARAMS = { status: 'active', tierSlug: null, limit: 200 }
@@ -164,8 +164,8 @@ const MAX_DONORS = 64
164164
const LINK_AMT_THRESHOLD = 24
165165
166166
export default {
167-
name: 'BVDContributors',
168-
components: { BVDContributorsContainer },
167+
name: 'BVContributors',
168+
components: { BVContributorsContainer },
169169
data() {
170170
return {
171171
platinumSponsors: [],

‎docs/components/feedback.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
name: 'BVDFeedback',
2+
name: 'BVFeedback',
33
data() {
44
return {
55
baseUrl: 'https://github.com/bootstrap-vue/bootstrap-vue'

0 commit comments

Comments
 (0)