🌐 AI搜索 & 代理 主页
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@
> [standard-version](https://github.com/conventional-changelog/standard-version) for commit
> guidelines.

<a name="2.6.1"></a>

## [v2.6.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.6.0...v2.6.1)

Released: 2020-03-06

### Bug Fixes v2.6.1

- **b-form-spinbutton:** respect step value for initial decrement when `wrap` enabled (closes
[#4884](https://github.com/bootstrap-vue/bootstrap-vue/issues/4884))
([#4885](https://github.com/bootstrap-vue/bootstrap-vue/issues/4885))
([28e7245](https://github.com/bootstrap-vue/bootstrap-vue/commit/28e724536be4762382328648f203bd46d8f52fdc))

### Other v2.6.1

- documentation updates and fixes
- dev dependency updates

<a name="2.6.0"></a>

## [v2.6.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.5.0...v2.6.0)
Expand Down Expand Up @@ -272,7 +290,7 @@ Released: 2020-01-08
- **b-collapse:** add optional scoping to default slot
([#4405](https://github.com/bootstrap-vue/bootstrap-vue/issues/4405))
([8e95bac](https://github.com/bootstrap-vue/bootstrap-vue/commit/8e95bacf9d00562f2676689d067ae0db009cbbb6))
- **b-container:** add support for bootstrap v4.4.x new responsive containers
- **b-container:** add support for Bootstrap v4.4.x new responsive containers
([0e318f4](https://github.com/bootstrap-vue/bootstrap-vue/commit/0e318f4755e65eb569dcc579938d0d72c02abd62))
- **b-dropdown:** add splitClass property to dropdown component
([#4394](https://github.com/bootstrap-vue/bootstrap-vue/issues/4394))
Expand Down Expand Up @@ -1932,7 +1950,7 @@ Released: 2019-02-18
([#2597](https://github.com/bootstrap-vue/bootstrap-vue/issues/2597))
([#2608](https://github.com/bootstrap-vue/bootstrap-vue/issues/2608))
([11c7524](https://github.com/bootstrap-vue/bootstrap-vue/commit/11c7524))
- **nuxt plugin:** fix typo with bootstrap vue css import properties
- **nuxt plugin:** fix typo with Bootstrap vue css import properties
([#2618](https://github.com/bootstrap-vue/bootstrap-vue/issues/2618))
([8581090](https://github.com/bootstrap-vue/bootstrap-vue/commit/8581090))
- **utils/get:** handle case where passed object is undefined
Expand Down Expand Up @@ -2011,7 +2029,7 @@ Released: (2019-02-14)
- **dependencies:** replace opencollective with opencollective-postinstall
([#2067](https://github.com/bootstrap-vue/bootstrap-vue/issues/2067))
([fa26882](https://github.com/bootstrap-vue/bootstrap-vue/commit/fa26882))
- **docs:** Update links to bootstrap v4.3 docs
- **docs:** Update links to Bootstrap v4.3 docs
([b5d5499](https://github.com/bootstrap-vue/bootstrap-vue/commit/b5d5499))
- **docs:** Button - fix typo ([#1962](https://github.com/bootstrap-vue/bootstrap-vue/issues/1962))
([dcbfcf9](https://github.com/bootstrap-vue/bootstrap-vue/commit/dcbfcf9))
Expand Down Expand Up @@ -2108,7 +2126,7 @@ Released: (2019-02-14)
[#1841](https://github.com/bootstrap-vue/bootstrap-vue/issues/1841)
([#2174](https://github.com/bootstrap-vue/bootstrap-vue/issues/2174))
([aacc7c0](https://github.com/bootstrap-vue/bootstrap-vue/commit/aacc7c0))
- **form-control:** remove interim class fixes from bootstrap 4.0.x
- **form-control:** remove interim class fixes from Bootstrap 4.0.x
([#1896](https://github.com/bootstrap-vue/bootstrap-vue/issues/1896))
([#2265](https://github.com/bootstrap-vue/bootstrap-vue/issues/2265))
([64bdf69](https://github.com/bootstrap-vue/bootstrap-vue/commit/64bdf69))
Expand Down
97 changes: 68 additions & 29 deletions docs/assets/scss/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

.hljs {
overflow-x: auto;
position: relative;
background-color: #f9f9f9;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.125);
}
Expand Down Expand Up @@ -137,42 +136,82 @@
background-color: #eee;
}

pre.editable {
&::after {
content: "(double click to edit)";
position: absolute;
top: 0;
right: 0;
color: #aaa;
text-align: right;
font-size: 0.75em;
padding: 5px 10px 0;
line-height: 15px;
height: 15px;
font-weight: 600;
}
.bd-code {
position: relative;

&:hover {
pre {
&::after {
font-size: 0.9em;
color: #444;
cursor: pointer;
content: attr(data-filename);
position: absolute;
top: -7.5px;
right: 0;
color: #6c757d;
text-align: right;
font-size: 0.75em;
line-height: 15px;
font-weight: 600;
}
}

&.live {
&::after {
content: "Live";
&.editable {
&::after {
content: "(Double click to edit)";
top: 5px;
right: 10px;
}

&:hover {
&::after {
font-size: 0.85em;
color: inherit;
cursor: pointer;
}
}

&.live {
&::after {
content: "Live";
}
}

&.error {
border: 1px solid #dc3545;
box-shadow: 0 1px 1px rgba(220, 53, 69, 0.5);

&::after {
content: "JavaScript compile error!";
color: #dc3545;
}
}
}
}
}

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

&::after {
content: "JavaScript compile error!";
color: #dc3545;
#carbonads {
// Override Bootstrap v4 docs CSS ad margin
margin: 0;
}

// Margins for the home page ad
@at-root .bv-section & {
margin-bottom: 3rem;
margin-top: 0;

#carbonads {
// Center the ad on the home page
margin-left: auto;
margin-right: auto;
}

@media (min-width: 768px) {
& {
margin-bottom: -1.5rem;
margin-top: 3rem;
}
}
}
}
Expand Down
40 changes: 40 additions & 0 deletions docs/components/ad.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
export default {
name: 'BVAd',
props: {
id: {
type: String,
default: '_carbonads_js'
},
url: {
type: String,
default: '//cdn.carbonads.com/carbon.js'
},
serve: {
type: String,
default: 'CE7ITK77'
},
placement: {
type: String,
default: 'bootstrap-vuejsorg'
}
},
computed: {
src() {
return `${this.url}?serve=${this.serve}&placement=${this.placement}`
}
},
render(h) {
return h('div', { staticClass: 'bv-ad' }, [
h('client-only', [
h('script', {
attrs: {
id: this.id,
async: 'async',
type: 'text/javascript',
src: this.src
}
})
])
])
}
}
2 changes: 1 addition & 1 deletion docs/components/anchored-heading.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mergeData } from 'vue-functional-data-merge'

export default {
name: 'BVDAnchoredHeading',
name: 'BVAnchoredHeading',
functional: true,
props: {
id: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const navLookup = nav.reduce((obj, section) => {
}, {})

export default {
name: 'BVDBreadcrumbs',
name: 'BVBreadcrumbs',
computed: {
items() {
const items = [{ text: 'Home', to: '/' }, { text: 'Docs', to: '/docs' }]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
name: 'CodeMirror',
name: 'BVCodeMirror',
props: {
value: {
type: String,
Expand Down
2 changes: 1 addition & 1 deletion docs/components/componentdoc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ import { kebabCase } from '../utils'
import AnchoredHeading from './anchored-heading'

export default {
name: 'BVDComponentdoc',
name: 'BVComponentdoc',
components: { AnchoredHeading },
props: {
component: {},
Expand Down
2 changes: 1 addition & 1 deletion docs/components/contributors-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const CLASS_NAME = 'contributors-container'
const CONTRIBUTOR_CLASS_NAME = 'contributor'

export default {
name: 'BVDContributorsContainer',
name: 'BVContributorsContainer',
functional: true,
props: {
type: {
Expand Down
30 changes: 15 additions & 15 deletions docs/components/contributors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,61 @@
<!-- PLATINUM SPONSORS -->
<template v-if="platinumSponsors.length > 0">
<h4 class="h5 mx-auto mt-3 text-muted">Platinum Sponsors</h4>
<BVDContributorsContainer
<BVContributorsContainer
type="platinum-sponsors"
:contributors="platinumSponsors"
:nofollow="false"
></BVDContributorsContainer>
></BVContributorsContainer>
</template>

<!-- GOLD SPONSORS -->
<template v-if="goldSponsors.length > 0">
<h4 class="h5 mx-auto mt-3 text-muted">Gold Sponsors</h4>
<BVDContributorsContainer
<BVContributorsContainer
type="gold-sponsors"
:contributors="goldSponsors"
:nofollow="false"
></BVDContributorsContainer>
></BVContributorsContainer>
</template>

<!-- SILVER SPONSORS -->
<template v-if="silverSponsors.length > 0">
<h4 class="h5 mx-auto mt-3 text-muted">Silver Sponsors</h4>
<BVDContributorsContainer
<BVContributorsContainer
type="silver-sponsors"
:contributors="silverSponsors"
:nofollow="false"
></BVDContributorsContainer>
></BVContributorsContainer>
</template>

<!-- BRONZE SPONSORS -->
<template v-if="bronzeSponsors.length > 0">
<h4 class="h5 mx-auto mt-3 text-muted">Bronze Sponsors</h4>
<BVDContributorsContainer
<BVContributorsContainer
type="bronze-sponsors"
:contributors="bronzeSponsors"
:nofollow="false"
></BVDContributorsContainer>
></BVContributorsContainer>
</template>
</template>

<!-- BACKERS -->
<template v-if="backers.length > 0">
<h3 class="h4 mx-auto mt-4 text-muted">Backers</h3>
<BVDContributorsContainer
<BVContributorsContainer
type="backers"
:contributors="backers"
></BVDContributorsContainer>
></BVContributorsContainer>
</template>

<!-- DONORS -->
<template v-if="donors.length > 0">
<h3 class="h4 mx-auto mt-4 text-muted">Donors</h3>
<BVDContributorsContainer
<BVContributorsContainer
type="donors"
:contributors="donors"
:show-name="false"
></BVDContributorsContainer>
></BVContributorsContainer>
</template>
</div>
</template>
Expand Down Expand Up @@ -146,7 +146,7 @@
</style>

<script>
import BVDContributorsContainer from '~/components/contributors-container'
import BVContributorsContainer from '~/components/contributors-container'

const OC_BASE_URL = 'https://rest.opencollective.com/v2/bootstrap-vue/orders/'
const OC_DEFAULT_PARAMS = { status: 'active', tierSlug: null, limit: 200 }
Expand All @@ -164,8 +164,8 @@ const MAX_DONORS = 64
const LINK_AMT_THRESHOLD = 24

export default {
name: 'BVDContributors',
components: { BVDContributorsContainer },
name: 'BVContributors',
components: { BVContributorsContainer },
data() {
return {
platinumSponsors: [],
Expand Down
2 changes: 1 addition & 1 deletion docs/components/feedback.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
name: 'BVDFeedback',
name: 'BVFeedback',
data() {
return {
baseUrl: 'https://github.com/bootstrap-vue/bootstrap-vue'
Expand Down
2 changes: 1 addition & 1 deletion docs/components/footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
import { version } from '~/content'

export default {
name: 'BVDFooter',
name: 'BVFooter',
props: {
isDocs: {
type: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion docs/components/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
import { version } from '~/content'

export default {
name: 'BVDHeader',
name: 'BVHeader',
data() {
return {
version,
Expand Down
2 changes: 1 addition & 1 deletion docs/components/icons-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const icons = iconNames
})

export default {
name: 'BVDIconsTable',
name: 'BVIconsTable',
data() {
return {
iconFilter: '',
Expand Down
Loading