Unverified Commit c4d09af6 authored by Vanessa's avatar Vanessa Committed by GitHub
Browse files

Merge pull request #31241 from nextcloud/fix/use-new-button-component

Fix/use new button component
parents cb621f37 383245ff
......@@ -25,11 +25,11 @@
:l10n-friday="$t('dav', 'Friday')"
:l10n-saturday="$t('dav', 'Saturday')"
:l10n-sunday="$t('dav', 'Sunday')" />
<button :disabled="loading || saving"
class="button primary"
<Button :disabled="loading || saving"
type="primary"
@click="save">
{{ $t('dav', 'Save') }}
</button>
</Button>
</div>
</template>
......@@ -42,11 +42,14 @@ import {
} from '../service/CalendarService'
import jstz from 'jstimezonedetect'
import TimezonePicker from '@nextcloud/vue/dist/Components/TimezonePicker'
import Button from '@nextcloud/vue/dist/Components/Button'
export default {
name: 'Availability',
components: {
CalendarAvailability,
TimezonePicker,
Button,
},
data() {
// Try to determine the current timezone, and fall back to UTC otherwise
......
......@@ -25,12 +25,12 @@
<form @submit.prevent="submit">
<p class="transfer-select-row">
<span>{{ readableDirectory }}</span>
<button v-if="directory === undefined" @click.prevent="start">
<Button v-if="directory === undefined" @click.prevent="start">
{{ t('files', 'Choose file or folder to transfer') }}
</button>
<button v-else @click.prevent="start">
</Button>
<Button v-else @click.prevent="start">
{{ t('files', 'Change') }}
</button>
</Button>
<span class="error">{{ directoryPickerError }}</span>
</p>
<p class="new-owner-row">
......@@ -72,6 +72,7 @@ import { generateOcsUrl } from '@nextcloud/router'
import { getFilePickerBuilder, showSuccess } from '@nextcloud/dialogs'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import Vue from 'vue'
import Button from '@nextcloud/vue/dist/Components/Button'
import logger from '../logger'
......@@ -86,6 +87,7 @@ export default {
name: 'TransferOwnershipDialogue',
components: {
Multiselect,
Button,
},
data() {
return {
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment