ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 6592-chat-component-+-button-open-search

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-07-20 13:39:42 +02:00 committed by GitHub
commit 0bd7968272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webapp/components/CommentForm/CommentForm.vue
View File

@ -8,7 +8,6 @@
:disabled="disabled && !update" :disabled="disabled && !update"
@click="handleCancel" @click="handleCancel"
data-test="cancel-button" data-test="cancel-button"
danger
> >
{{ $t('actions.cancel') }} {{ $t('actions.cancel') }}
</base-button> </base-button>

7
webapp/components/ContributionForm/ContributionForm.vue
View File

@ -169,12 +169,7 @@
</ds-flex-item> </ds-flex-item>
<ds-flex-item width="0.15" /> <ds-flex-item width="0.15" />
<ds-flex-item class="action-buttons-group" width="2"> <ds-flex-item class="action-buttons-group" width="2">
<base-button <base-button data-test="cancel-button" :disabled="loading" @click="$router.back()">
data-test="cancel-button"
:disabled="loading"
@click="$router.back()"
danger
>
{{ $t('actions.cancel') }} {{ $t('actions.cancel') }}
</base-button> </base-button>
<base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled> <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>

2
webapp/components/_new/features/MySomethingList/MySomethingList.vue
View File

@ -56,7 +56,7 @@
> >
{{ isEditing ? $t('actions.save') : texts.addButton }} {{ isEditing ? $t('actions.save') : texts.addButton }}
</base-button> </base-button>
<base-button v-if="isEditing" id="cancel" danger @click="handleCancel()"> <base-button v-if="isEditing" id="cancel" @click="handleCancel()">
{{ $t('actions.cancel') }} {{ $t('actions.cancel') }}
</base-button> </base-button>
</ds-space> </ds-space>