8000 Merge branch 'dev' into chore-ci-cache-action-v2 · bootstrap-vue/bootstrap-vue@c3cae79 · GitHub
[go: up one dir, main page]
Skip to content

Commit c3cae79

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into chore-ci-cache-action-v2
2 parents f3e1001 + 1fabd68 commit c3cae79

30 files changed

+1496
-941
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<br>
77

88
<p align="center">
9-
BootstrapVue, with over 40 available plugins, more than 80 custom components, and over 670 icons,
10-
provides one of the most comprehensive implementations of the Bootstrap v4 component and grid
11-
system for Vue.js, complete with extensive and automated WAI-ARIA accessibility markup.
9+
With more than 85 components, over 45 available plugins, several directives, and 1000+ icons,
10+
BootstrapVue provides one of the most comprehensive implementations of the Bootstrap v4.5
11+
component and grid system available for Vue.js v2.6, complete with extensive and automated
12+
WAI-ARIA accessibility markup.
1213
</p>
1314
<br>
1415

‎docs/components/footer.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
<li><b-link to="/docs/reference" exact>Reference</b-link></li>
2020
<li><b-link to="/play" exact>Playground</b-link></li>
2121
</ul>
22-
<!-- TODO: Uncomment when we have themes
2322
<h5 class="bd-text-purple-bright mb-1 mt-3">Themes</h5>
2423
<ul class="list-unstyled ml-3">
2524
<li><b-link to="/themes" exact>Themes and dashboards</b-link></li>
2625
</ul>
27-
-->
2826
</b-col>
2927

3028
<b-col cols="auto" class="text-left">

‎docs/components/header.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<b-nav-item to="/docs/directives" active-class="active" no-prefetch>Directives</b-nav-item>
3636
<b-nav-item to="/docs/icons" active-class="active" no-prefetch>Icons</b-nav-item>
3737
<b-nav-item to="/docs/reference" active-class="active">Reference</b-nav-item>
38-
<!-- TODO: Uncomment when we have themes
3938
<b-nav-item to="/themes" active-class="active" no-prefetch>Themes</b-nav-item>
40-
-->
4139
<b-nav-item to="/play" active-class="active" no-prefetch>Play</b-nav-item>
4240
</b-navbar-nav>
4341
</div>

‎docs/components/icons-table.vue

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
<transition-group
4343
tag="ul"
4444
name="flip-icon-list"
45-
class="row row-cols-3 row-cols-sm-4 row-cols-lg-6 list-unstyled mb-n3 position-relative"
45+
class="row row-cols-3 row-cols-sm-4 row-cols-lg-6 row-cols-xl-8 row-cols-xxl-10 list-unstyled"
4646
>
4747
<b-col
4848
v-for="icon in filteredIcons"
4949
:key="`_icon_${icon.name}`"
5050
tag="li"
51-
class="flip-icon-list-icon d-inline-flex flex-column mb-3 text-center"
51+
class="flip-icon-list-icon d-inline-flex flex-column mb-4 text-center"
5252
>
53-
<div class="card bg-light p-3" :title="icon.name">
53+
<b-card bg-variant="light" class="px-3 py-4 border-0" no-body>
5454
<b-icon :icon="icon.name" class="mx-auto"></b-icon>
55-
</div>
56-
<b-form-text class="mt-1 text-break" :title="icon.name">{{ icon.name }}</b-form-text>
55+
</b-card>
56+
<b-form-text class="mt-2 text-break" :title="icon.name">{{ icon.name }}</b-form-text>
5757
</b-col>
5858
</transition-group>
5959
<div aria-live="polite" aria-atomic="true">
@@ -121,6 +121,20 @@
121121
.flip-icon-list-leave-active {
122122
position: absolute;
123123
}
124+
125+
@media (min-width: 1200px) {
126+
.row-cols-xl-8 > * {
127+
flex: 0 0 12.5%;
128+
max-width: 12.5%;
129+
}
130+
}
131+
132+
@media (min-width: 1400px) {
133+
.row-cols-xxl-10 > * {
134+
flex: 0 0 10%;
135+
max-width: 10%;
136+
}
137+
}
124138
</style>
125139

126140
<script>

‎docs/components/sidebar.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
</b-nav>
5252
</b-link>
5353

54-
<!-- TODO: Uncomment when we have themes
5554
<b-link
5655
to="/themes"
5756
router-tag="div"
@@ -69,7 +68,6 @@
6968
Themes
7069
</b-link>
7170
</b-link>
72-
-->
7371

7472
<b-link
7573
to="/play"

‎docs/content/index.js renamed to ‎docs/content.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,36 @@ export const nav = [
6262
}
6363
]
6464

65+
// RegExp to grab the minor version from a full version
66+
const minorRE = /^(\d+\.\d+)(\..+)$/
67+
// RegExp to grab the major version from a full version
68+
const majorRE = /^(\d+)(\.\d+\..+)$/
69+
6570
export const bootstrapVersion = parseVersion(dependencies.bootstrap)
71+
export const bootstrapVersionMinor = bootstrapVersion.replace(minorRE, '$1')
72+
export const bootstrapVersionMajor = bootstrapVersion.replace(majorRE, '$1')
73+
6674
export const bootstrapIconsVersion = parseFullVersion(devDependencies['bootstrap-icons'])
75+
export const bootstrapIconsVersionMinor = bootstrapIconsVersion.replace(minorRE, '$1')
76+
export const bootstrapIconsVersionMajor = bootstrapIconsVersion.replace(majorRE, '$1')
77+
export const bootstrapIconsCount = 1000
78+
6779
export const popperVersion = parseVersion(dependencies['popper.js'])
80+
export const popperVersionMinor = popperVersion.replace(minorRE, '$1')
81+
export const popperVersionMajor = popperVersion.replace(majorRE, '$1')
82+
6883
export const portalVueVersion = parseVersion(dependencies['portal-vue'])
84+
export const portalVueVersionMinor = portalVueVersion.replace(minorRE, '$1')
85+
export const portalVueVersionMajor = portalVueVersion.replace(majorRE, '$1')
86+
6987
export const nuxtVersion = parseVersion(devDependencies.nuxt)
88+
export const nuxtVersionMinor = nuxtVersion.replace(minorRE, '$1')
89+
export const nuxtVersionMajor = nuxtVersion.replace(majorRE, '$1')
90+
7091
export const vueVersion = parseVersion(devDependencies.vue)
92+
export const vueVersionMinor = vueVersion.replace(minorRE, '$1')
93+
export const vueVersionMajor = vueVersion.replace(majorRE, '$1')
94+
7195
export const defaultConfig = DEFAULT_CONFIG
7296
export const bvDescription = description
7397

‎docs/content/themes/argon-dashboard-pro.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: 'BootstrapVue Argon Dashboard PRO'
2+
type: 'dashboard'
3+
category: 'Admin & Dashboard'
4+
img: 'https://raw.githubusercontent.com/creativetimofficial/public-assets/master/bootstrap-vue-argon-dashboard-pro/opt_badp_thumbnail.jpg'
5+
href: 'https://www.creative-tim.com/product/bootstrap-vue-argon-dashboard-pro?partner=134895'
6+
description: 'BootstrapVue Argon Dashboard PRO is a completely new product built on our newest re-built from scratch framework structure that is meant to make our products more intuitive, more adaptive and, needless to say, so much easier to customize. Let Argon amaze you with its cool features and build tools and get your project to a whole new level.'
7+
provider: 'Creative Tim'
8+
price: '$89.00'

‎docs/markdown/intro/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ The online documentation is comprised of the following sections:
2727
- [Icons](/docs/icons) - Icons and icon plugin documentation <b-badge>v2.2.0+</b-badge>
2828
- [Reference](/docs/reference) - Reference information and documentation
2929
- [Playground](/play) - Online playground
30-
31-
<!-- TODO: Uncomment when we have themes
3230
- [Themes](/themes) - Themes and dashboards
33-
-->
3431

3532
## Prerequisites
3633

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ stacked tables, etc). Our custom CSS relies on variables defined the Bootstrap v
99
using the BootstrapVue source SCSS, you can have your variable overrides (such as breakpoints, theme
1010
colors, etc) adjust the custom BootstrapVue css generation.
1111

12-
<!-- TODO: Uncomment when we have themes
1312
For premium dashboards and themes, please refer to the [`Themes section`](/themes) of the
1413
documentation.
15-
-->
1614

1715
## SASS variable defaults
1816

@@ -283,10 +281,8 @@ a {
283281
284282
## See also
285283
286-
<!-- TODO: Uncomment when we have themes
287284
- For premium dashboards and themes, please refer to the [`Themes section`](/themes) of the
288285
documentation.
289-
-->
290286
291287
- If you are defining custom breakpoint names, please see the
292288
[BootstrapVue settings](/docs/reference/settings) page on how to update BootstrapVue `<b-col>` and

‎docs/nuxt.config.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,15 +280,19 @@ module.exports = {
280280
plugins: ['~/plugins/bootstrap-vue.js', '~/plugins/play.js', '~/plugins/docs.js'],
281281

282282
buildModules: ['@nuxtjs/google-analytics'],
283-
modules: ['@nuxtjs/pwa', '@nuxtjs/robots', '@nuxtjs/sitemap'],
283+
modules: ['@nuxt/content', '@nuxtjs/pwa', '@nuxtjs/robots', '@nuxtjs/sitemap'],
284284

285-
'google-analytics': {
285+
googleAnalytics: {
286286
id: GA_TRACKING_ID,
287287
autoTracking: {
288288
exception: true
289289
}
290290
},
291291

292+
content: {
293+
apiPrefix: 'api'
294+
},
295+
292296
// We enable crawling in production docs only
293297
robots: () => {
294298
// In production docs we allow crawling, else we deny crawling

‎docs/pages/docs/icons/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Main from '~/components/main'
77
import QuickLinks from '~/components/quick-links'
88
import Section from '~/components/section'
99
import docsMixin from '~/plugins/docs-mixin'
10-
import { icons as iconsMeta, bootstrapIconsVersion } from '~/content'
10+
import { icons as iconsMeta, bootstrapIconsVersion, bootstrapIconsCount } from '~/content'
1111
import readmeData from '~/../src/icons/README.md'
1212

1313
const { titleLead = '', body = '', baseTOC = {} } = readmeData
@@ -34,7 +34,8 @@ export default {
3434
baseTOC,
3535
// Key for icons meta is `''` (empty slug)
3636
meta: iconsMeta[''],
37-
bootstrapIconsVersion
37+
bootstrapIconsVersion,
38+
bootstrapIconsCount
3839
}
3940
},
4041
computed: {

‎docs/pages/docs/index.js

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,30 @@ import QuickLinks from '~/components/quick-links'
44
import Section from '~/components/section'
55
import docsMixin from '~/plugins/docs-mixin'
66
import {
7+
bootstrapIconsCount,
78
bootstrapVersion,
9+
bootstrapVersionMajor,
10+
bootstrapVersionMinor,
811
defaultConfig,
912
nuxtVersion,
13+
nuxtVersionMajor,
14+
nuxtVersionMinor,
1015
popperVersion,
16+
popperVersionMajor,
17+
popperVersionMinor,
1118
portalVueVersion,
19+
portalVueVersionMajor,
20+
portalVueVersionMinor,
1221
version,
13-
vueVersion
22+
vueVersion,
23+
vueVersionMajor,
24+
vueVersionMinor
1425
} from '~/content'
1526
import meta from '~/markdown/intro/meta.json'
1627
import readmeData from '~/markdown/intro/README.md'
1728

1829
const { titleLead = '', body = '', baseTOC = {} } = readmeData
1930

20-
// RegExp to grab the minor version from a full version
21-
const minorRE = /^(\d+\.\d+)(\..+)$/
22-
// RegExp to grab the major version from a full version
23-
const majorRE = /^(\d+)(\.\d+\..+)$/
24-
2531
// @vue/component
2632
export default {
2733
name: 'BDVDocs',
@@ -36,25 +42,26 @@ export default {
3642
data() {
3743
return {
3844
bootstrapVersion,
39-
bootstrapVersionMinor: bootstrapVersion.replace(minorRE, '$1'),
40-
bootstrapVersionMajor: bootstrapVersion.replace(majorRE, '$1'),
45+
bootstrapVersionMinor,
46+
bootstrapVersionMajor,
47+
bootstrapIconsCount,
4148
defaultConfig,
4249
nuxtVersion,
43-
nuxtVersionMinor: nuxtVersion.replace(minorRE, '$1'),
44-
nuxtVersionMajor: nuxtVersion.replace(majorRE, '$1'),
50+
nuxtVersionMinor,
51+
nuxtVersionMajor,
4552
popperVersion,
46-
popperVersionMinor: popperVersion.replace(minorRE, '$1'),
47-
popperVersionMajor: popperVersion.replace(majorRE, '$1'),
53+
popperVersionMinor,
54+
popperVersionMajor,
4855
portalVueVersion,
49-
portalVueVersionMinor: portalVueVersion.replace(minorRE, '$1'),
50-
portalVueVersionMajor: portalVueVersion.replace(majorRE, '$1'),
56+
portalVueVersionMinor,
57+
portalVueVersionMajor,
5158
titleLead,
5259
body,
5360
baseTOC,
5461
version,
5562
vueVersion,
56-
vueVersionMinor: vueVersion.replace(minorRE, '$1'),
57-
vueVersionMajor: vueVersion.replace(majorRE, '$1')
63+
vueVersionMinor,
64+
vueVersionMajor
5865
}
5966
},
6067
computed: {

‎docs/pages/index.vue

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
<b-row class="mb-4">
8383
<b-col lg="10" offset-lg="1">
8484
<p class="text-lg-center">
85-
With more than 85 components, over 45 available plugins, several directives, and 670+ icons,
85+
With more than 85 components, over 45 available plugins, several directives, and {{ bootstrapIconsCount }}+ icons,
8686
<span class="bd-text-purple-bright">BootstrapVue</span> provides one of the most
8787
comprehensive implementations of the
88-
<span class="bd-text-purple-bright">Bootstrap v{{ bootstrapVersionMinor }}</span> component and grid system
88+
<span class="bd-text-purple-bright">Bootstrap v{{ bootstrapVersionMajor }}</span> component and grid system
8989
available for <span class="bd-text-purple-bright">Vue.js v{{ vueVersionMinor }}</span>, complete with
9090
extensive and automated
9191
<b-link href="https://www.w3.org/WAI/standards-guidelines/aria/" target="_blank">
@@ -546,7 +546,13 @@ $bv-angle-padding-md: 6rem;
546546
</style>
547547

548548
<script>
549-
import { version, bootstrapVersion, vueVersion } from '~/content'
549+
import {
550+
bootstrapIconsCount,
551+
bootstrapVersionMajor,
552+
bootstrapVersionMinor,
553+
version,
554+
vueVersionMinor
555+
} from '~/content'
550556
import BvLogo from '~/components/bv-logo'
551557
import BVCarbonAd from '~/components/carbon-ad'
552558
import BVContributors from '~/components/contributors'
@@ -557,25 +563,13 @@ export default {
557563
BVCarbonAd,
558564
BVContributors
559565
},
560-
data() {
561-
return {
562-
isIE: false,
563-
showLogo: false
564-
}
565-
},
566-
computed: {
567-
version: () => version,
568-
bootstrapVersionMinor: () => bootstrapVersion.replace(/\.\d+$/, ''),
569-
vueVersionMinor: () => vueVersion.replace(/\.\d+$/, ''),
570-
bootstrapUrl() {
571-
return `https://getbootstrap.com/docs/${this.bootstrapVersionMinor}`
572-
}
573-
},
574-
mounted() {
575-
this.$nextTick(() => {
576-
this.isIE = /msie|trident/i.test(window.navigator.userAgent || '')
577-
this.showLogo = true
578-
})
566+
created() {
567+
this.bootstrapUrl = `https://getbootstrap.com/docs/${bootstrapVersionMinor}`
568+
this.bootstrapVersionMajor = bootstrapVersionMajor
569+
this.bootstrapVersionMinor = bootstrapVersionMinor
570+
this.bootstrapIconsCount = bootstrapIconsCount
571+
this.vueVersionMinor = vueVersionMinor
572+
this.version = version
579573
}
580574
}
581575
</script>

0 commit comments

Comments
 (0)
0