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
6 changes: 3 additions & 3 deletions src/components/AppNavigation/Trashbin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<NcButton class="table__header sort-button sort-button--summary"
:class="{ 'sort-button--active': sortOrder === 'summary' }"
alignment="center-reverse"
type="tertiary"
variant="tertiary"
@click="setSortOrder('summary')">
<template #icon>
<MenuDown v-if="sortDirection && sortOrder === 'summary'" />
Expand All @@ -59,7 +59,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<NcButton class="table__header table__header--deletedAt sort-button sort-button--deletedAt"
:class="{ 'sort-button--active': sortOrder === 'deletedAt' }"
alignment="center"
type="tertiary"
variant="tertiary"
@click="setSortOrder('deletedAt')">
<template #icon>
<MenuDown v-if="sortDirection && sortOrder === 'deletedAt'" />
Expand Down Expand Up @@ -108,7 +108,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<p v-if="retentionDuration">
{{ n('tasks', 'Elements in the trash bin are deleted after {numDays} day', 'Elements in the trash bin are deleted after {numDays} days', retentionDuration, { numDays: retentionDuration }) }}
</p>
<NcButton type="primary" @click="onEmptyTrashBin()">
<NcButton variant="primary" @click="onEmptyTrashBin()">
<template #icon>
<DeleteForever :size="20" />
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<NcButton @click="onClose()">
{{ t('tasks', 'Cancel') }}
</NcButton>
<NcButton type="primary" native-type="submit">
<NcButton variant="primary" type="submit">
<template v-if="isNewAlarm">
{{ t('tasks', 'Create reminder') }}
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<NcButton @click="onClose()">
{{ t('tasks', 'Cancel') }}
</NcButton>
<NcButton type="primary" @click="onSelectDateTime">
<NcButton variant="primary" @click="onSelectDateTime">
{{ t('tasks', 'Update reminder') }}
</NcButton>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/CreateMultipleTasksDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
{{ t('tasks', 'Cancel') }}
</NcButton>
<NcButton ref="createButton"
type="primary"
variant="primary"
@click="addTasks">
{{ t('tasks', 'Create tasks') }}
</NcButton>
Expand Down
4 changes: 2 additions & 2 deletions src/components/DeleteCompletedModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<template>
<div class="loadmore reactive">
<NcButton v-show="completedTasksCount"
type="tertiary"
variant="tertiary"
@click="openModal">
<template #icon>
<Delete :size="20" />
Expand All @@ -39,7 +39,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<h3>
{{ n('tasks', 'This will delete {taskCount} completed task and its subtasks from calendar "{calendar}".', 'This will delete {taskCount} completed tasks and their subtasks from calendar "{calendar}".', initialCompletedRootTasksCount, {taskCount: initialCompletedRootTasksCount, calendar: calendar.displayName}, { sanitize: false, escape: false }) }}
</h3>
<NcButton type="primary"
<NcButton variant="primary"
class="delete-completed__button"
@click="deleteCompletedTasks">
<template #icon>
Expand Down
2 changes: 1 addition & 1 deletion src/components/LoadCompletedButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<div v-show="!loadedCompleted"
:title="buttonStrings.tooltip"
class="loadmore reactive">
<NcButton type="tertiary"
<NcButton variant="tertiary"
@click="loadCompletedTasks">
<template #icon>
<CloudDownload :size="20" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/TaskCreateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
{{ t('tasks', 'Cancel') }}
</NcButton>
<NcButton :disabled="loading"
type="primary"
variant="primary"
@click="addTask">
{{ t('tasks', 'Create task') }}
</NcButton>
Expand Down
2 changes: 1 addition & 1 deletion src/components/TaskStatusDisplay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<NcButton v-if="status"
:title="status.message"
:disabled="isDisabled"
type="tertiary"
variant="tertiary"
:aria-label="status.message"
@click="statusClicked">
<template #icon>
Expand Down
2 changes: 1 addition & 1 deletion src/views/AppContent/Calendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
collection-id="uncompleted" />
<NcButton v-if="closedCount(calendarId)"
alignment="center-reverse"
type="tertiary"
variant="tertiary"
class="reactive heading"
@click="toggleHidden">
<template #icon>
Expand Down
Loading