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

Commit e79251a

Browse files
authored
Merge branch 'dev' into readme-partners
2 parents c35148b + 4bb9ba4 commit e79251a

File tree

32 files changed

+511
-481
lines changed

32 files changed

+511
-481
lines changed

docs/components/contributors.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export default {
236236
imageUrl: entry.fromAccount.imageUrl,
237237
// We only link their website when the total amount is at or above a certain
238238
// threshold to prevent some questionable websites from abusing opencollective
239-
// as a means to improve thier Google page ranking via backlinks
239+
// as a means to improve their Google page ranking via backlinks
240240
website:
241241
Math.max(amount || 0, totalAmount || 0) < LINK_AMT_THRESHOLD
242242
? null

docs/pages/themes.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
vendor/provider website for current pricing.
7272
</li>
7373
<li>
74-
Theme licenses are typicaly per-site (unless onterwised noted). Refer to the theme site
75-
documentaton for licensing information.
74+
Theme licenses are typically per-site (unless onterwised noted). Refer to the theme
75+
site documentation for licensing information.
7676
</li>
7777
<li>
7878
BootstrapVue does not guarantee that all coustom components provided by a theme are
@@ -102,10 +102,10 @@
102102
</li>
103103
<li>
104104
Should avoid the need for jQuery or Bootstrap v4 JavaScript files (except for included
105-
3<sup>rd</sup> party compoents if required).
105+
3<sup>rd</sup> party components if required).
106106
</li>
107107
<li>Should provide the source SCSS/SASS files/variables.</li>
108-
<li>Should promote that it is based on (or compatable with) <i>BootstrapVue</i>.</li>
108+
<li>Should promote that it is based on (or compatible with) <i>BootstrapVue</i>.</li>
109109
<li>
110110
Custom components provided by the theme should be WAI-ARIA accessible. Any WAI-ARIA
111111
limitations should be noted in the theme documeantation.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"autoprefixer": "^9.7.6",
112112
"babel-core": "^7.0.0-bridge.0",
113113
"babel-eslint": "^10.1.0",
114-
"babel-jest": "^25.4.0",
114+
"babel-jest": "^25.5.0",
115115
"babel-plugin-istanbul": "^6.0.0",
116116
"bootstrap-icons": "^1.0.0-alpha3",
117117
"bundlewatch": "^0.2.6",
@@ -138,9 +138,9 @@
138138
"html-loader": "^1.1.0",
139139
"husky": "^4.2.5",
140140
"improved-yarn-audit": "^2.0.0",
141-
"jest": "^25.4.0",
141+
"jest": "^25.5.0",
142142
"jest-environment-jsdom-fourteen": "^1.0.1",
143-
"lint-staged": "^10.1.7",
143+
"lint-staged": "^10.2.0",
144144
"loader-utils": "^2.0.0",
145145
"lodash": "^4.17.15",
146146
"marked": "^1.0.0",

src/components/avatar/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ styling on the content.
6161

6262
Use the `src` prop to specify a URL of an image to use as the avatar content. The image should have
6363
an aspect ratio of `1:1` (meaning the width and height should be equal), otherwise image aspect
64-
distortion will occur. The image will be scaled up or down to fit withing the avatar's bounding box,
64+
distortion will occur. The image will be scaled up or down to fit within the avatar's bounding box,
6565
and will be sized to show the avatar's [variant background](#variants) around the edge.
6666

6767
```html

src/components/calendar/calendar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ export const BCalendar = Vue.extend({
370370
},
371371
// Computed props that return a function reference
372372
dateOutOfRange() {
373-
// Check wether a date is within the min/max range
373+
// Check whether a date is within the min/max range
374374
// returns a new function ref if the pops change
375375
// We do this as we need to trigger the calendar computed prop
376376
// to update when these props update

src/components/card/card-img-lazy.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ describe('card-image', () => {
141141
expect(wrapper.attributes('width')).toBe('600')
142142
})
143143

144-
it('has attribute heigth when prop height set', async () => {
144+
it('has attribute height when prop height set', async () => {
145145
const wrapper = mount(BCardImgLazy, {
146146
context: {
147147
props: {

src/components/card/card-img.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ describe('card-image', () => {
141141
expect(wrapper.attributes('width')).toBe('600')
142142
})
143143

144-
it('has attribute heigth when prop height set', async () => {
144+
it('has attribute height when prop height set', async () => {
145145
const wrapper = mount(BCardImg, {
146146
context: {
147147
props: {

src/components/form-datepicker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ Internationalization of the date picker's calendar is provided via
520520
[`Intl.DateTimeFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat),
521521
except for labels applied to elements of the calendar control (aria-labels, selected status, and
522522
help text). You must provide your own translations for these labels. The available locales will be
523-
browser dependant (not all browsers support all locales)
523+
browser dependent (not all browsers support all locales)
524524

525525
By default `<b-form-datepicker>` will use the browser's default locale, but you can specify the
526526
locale (or locales) to use via the `locale` prop. The prop accepts either a single locale string, or

src/components/form-rating/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ The following is an example of placing `<b-form-rating>` in an input group:
473473

474474
When a `locale` is specified, the displayed value (when the `show-value` prop is `true`) will be in
475475
the browser's default locale. To change the locale, simple set the `locale` prop to the preferred
476-
locale, or an array of prefered locales (most preferred locale first). This will affect the optional
476+
locale, or an array of preferred locales (most preferred locale first). This will affect the optional
477477
displayed value and the left-to-right or right-to-left orientation of the component.
478478

479479
```html

src/components/form-spinbutton/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ By default `<b-form-spinbutton>` will format the displayed number in the users b
202202
locale. You can change the localized formatting by specifying a locale (or array of locales) via the
203203
`locale` prop. Number format localization is performed via
204204
[`Intl.NumberFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat).
205-
The locales available will be dependant on the browser implementation. Localization only controls
205+
The locales available will be dependent on the browser implementation. Localization only controls
206206
the presentation of the value to the user, and does not affect the `v-model`.
207207

208208
```html

0 commit comments

Comments
 (0)