Skip to content

chore(deps): update devdependency eslint-plugin-vue to v7 #5844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2020
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
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module.exports = {
],
'object-shorthand': ['error', 'properties'],
'spaced-comment': 'off', // needed to ignore `/*#__PURE__*/` comments
'vue/custom-event-name-casing': 'off',
'vue/html-self-closing': [
'error',
{
Expand All @@ -35,9 +36,8 @@ module.exports = {
}
],
'vue/max-attributes-per-line': ['error', { singleline: 4 }],
'vue/no-template-shadow': 'off',
'vue/no-use-v-if-with-v-for': 'off',
'vue/no-v-html': 'off',
'vue/one-component-per-file': 'off',
'vue/require-default-prop': 'off',
'vue/require-prop-types': 'off',
'vue/singleline-html-element-content-newline': 'off'
Expand Down
34 changes: 17 additions & 17 deletions docs/components/bv-logo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,23 @@
<div v-else class="bv-logo"></div>
</template>

<script>
export default {
data() {
return {
isIE: false,
showLogo: false
}
},
mounted() {
this.$nextTick(() => {
this.isIE = /msie|trident/i.test(window.navigator.userAgent || '')
this.showLogo = true
})
}
}
</script>

<style lang="scss" scoped>
.bv-logo {
display: block;
Expand Down Expand Up @@ -159,20 +176,3 @@
}
}
</style>

<script>
export default {
data() {
return {
isIE: false,
showLogo: false
}
},
mounted() {
this.$nextTick(() => {
this.isIE = /msie|trident/i.test(window.navigator.userAgent || '')
this.showLogo = true
})
}
}
</script>
80 changes: 40 additions & 40 deletions docs/components/componentdoc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
bordered
striped
>
<template v-slot:cell(prop)="{ value, item }">
<template #cell(prop)="{ value, item }">
<code class="text-nowrap notranslate" translate="no">{{ value }}</code><br>
<b-badge v-if="item.required" variant="info">Required</b-badge>
<b-badge v-if="item.settings" variant="dark" href="/docs/reference/settings" title="Configurable in settings">Settings</b-badge>
Expand All @@ -105,13 +105,13 @@
<b-badge v-if="item.deprecated" variant="danger">Deprecated</b-badge>
<b-badge v-else-if="item.deprecation" variant="warning">Deprecation</b-badge>
</template>
<template v-slot:cell(type)="{ value }">
<template #cell(type)="{ value }">
<span v-html="value"></span>
</template>
<template v-slot:cell(defaultValue)="{ value }">
<template #cell(defaultValue)="{ value }">
<code v-if="value" class="word-wrap-normal notranslate" translate="no">{{ value }}</code>
</template>
<template v-slot:row-details="{ item }">
<template #row-details="{ item }">
<p v-if="typeof item.deprecated === 'string'" class="mb-1 small">
{{ item.deprecated }}
</p>
Expand Down Expand Up @@ -158,10 +158,10 @@
bordered
striped
>
<template v-slot:cell(prop)="{ value }">
<template #cell(prop)="{ value }">
<code class="notranslate" translate="no">{{ kebabCase(value) }}</code>
</template>
<template v-slot:cell(event)="{ value }">
<template #cell(event)="{ value }">
<code class="notranslate" translate="no">{{ value }}</code>
</template>
</b-table-lite>
Expand All @@ -181,11 +181,11 @@
bordered
striped
>
<template v-slot:cell(name)="{ value, item }">
<template #cell(name)="{ value, item }">
<code class="text-nowrap notranslate" translate="no">{{ value }}</code>
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
</template>
<template v-slot:cell(scope)="{ value, detailsShowing, toggleDetails }">
<template #cell(scope)="{ value, detailsShowing, toggleDetails }">
<b-button
v-if="value"
variant="outline-info"
Expand All @@ -197,7 +197,7 @@
</b-button>
<span v-else>No</span>
</template>
<template v-slot:row-details="{ item }">
<template #row-details="{ item }">
<b-table-lite
:items="item.scope"
:fields="[{ key: 'prop', label: 'Property' }, 'type', 'description']"
Expand All @@ -207,19 +207,19 @@
caption-top
small
>
<template v-slot:thead-top>
<template #thead-top>
<b-tr>
<b-th colspan="3" class="text-center">
<code class="text-nowrap notranslate" translate="no">{{ item.name }}</code>
Slot scoped properties
</b-th>
</b-tr>
</template>
<template v-slot:cell(prop)="{ value, item }">
<template #cell(prop)="{ value, item: cellItem }">
<code class="text-nowrap notranslate" translate="no">{{ value }}</code>
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
<b-badge v-if="cellItem.version" variant="secondary">v{{ cellItem.version }}+</b-badge>
</template>
<template v-slot:cell(type)="{ value }">
<template #cell(type)="{ value }">
<code class="text-nowrap notranslate" translate="no">{{ value || 'Any' }}</code>
</template>
</b-table-lite>
Expand All @@ -240,11 +240,11 @@
bordered
striped
>
<template v-slot:cell(event)="{ value, item }">
<template #cell(event)="{ value, item }">
<code class="notranslate" translate="no">{{ value }}</code>
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
</template>
<template v-slot:cell(args)="{ value, item }">
<template #cell(args)="{ value, item }">
<ol v-if="value && value.length > 0" class="list-unstyled mb-0">
<li v-for="(arg, idx) in value" :key="`event-${item.event}-${arg.arg || idx}`">
<template v-if="arg.arg">
Expand Down Expand Up @@ -274,11 +274,11 @@
bordered
striped
>
<template v-slot:cell(event)="{ value, item }">
<template #cell(event)="{ value, item }">
<code class="text-nowrap notranslate" translate="no">{{ value }}</code>
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
</template>
<template v-slot:cell(args)="{ value, item }">
<template #cell(args)="{ value, item }">
<p
v-for="arg in value"
:key="`event-${item.event}-${arg.arg ? arg.arg : 'none'}`"
Expand All @@ -295,29 +295,6 @@
</section>
</template>

<style scoped>
h3::before {
display: block;
height: 1.25rem;
margin-top: -1.25rem;
content: '';
}

code.bigger {
font-size: 105%;
}

ul.component-ref-mini-toc:empty {
display: none;
}

/deep/ .word-wrap-normal {
white-space: normal !important;
word-break: normal !important;
overflow-wrap: normal !important;
}
</style>

<script>
import Vue from 'vue'
import commonProps from '../common-props.json'
Expand Down Expand Up @@ -529,3 +506,26 @@ export default {
}
}
</script>

<style scoped>
h3::before {
display: block;
height: 1.25rem;
margin-top: -1.25rem;
content: '';
}

code.bigger {
font-size: 105%;
}

ul.component-ref-mini-toc:empty {
display: none;
}

/deep/ .word-wrap-normal {
white-space: normal !important;
word-break: normal !important;
overflow-wrap: normal !important;
}
</style>
Loading