IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

make cancel buttons red

Browse Source
This commit is contained in:
Alina Beck 2020-01-09 13:37:15 +05:30
parent 34006a25e2
commit 93b6323c34
9 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@
: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>

2
webapp/components/DeleteData/DeleteData.vue
View File

@ -62,7 +62,7 @@
/> />
</ds-flex-item> </ds-flex-item>
<ds-flex-item :width="{ base: '100%', sm: '100%', md: '100%', lg: 1 }"> <ds-flex-item :width="{ base: '100%', sm: '100%', md: '100%', lg: 1 }">
<ds-button icon="trash" danger :disabled="!deleteEnabled" @click="handleSubmit"> <ds-button icon="trash" danger filled :disabled="!deleteEnabled" @click="handleSubmit">
{{ $t('settings.deleteUserAccount.name') }} {{ $t('settings.deleteUserAccount.name') }}
</ds-button> </ds-button>
</ds-flex-item> </ds-flex-item>

7
webapp/components/Modal/ConfirmModal.vue
View File

@ -10,7 +10,12 @@
<p v-html="message" /> <p v-html="message" />
<template slot="footer"> <template slot="footer">
<base-button class="cancel" :icon="modalData.buttons.cancel.icon" @click="cancel"> <base-button
class="cancel"
:danger="!modalData.buttons.confirm.danger"
:icon="modalData.buttons.cancel.icon"
@click="cancel"
>
{{ $t(modalData.buttons.cancel.textIdent) }} {{ $t(modalData.buttons.cancel.textIdent) }}
</base-button> </base-button>

2
webapp/components/Modal/DisableModal.vue
View File

@ -5,7 +5,7 @@
<template slot="footer"> <template slot="footer">
<base-button class="cancel" @click="cancel">{{ $t('disable.cancel') }}</base-button> <base-button class="cancel" @click="cancel">{{ $t('disable.cancel') }}</base-button>
<base-button danger class="confirm" icon="exclamation-circle" @click="confirm"> <base-button danger filled class="confirm" icon="exclamation-circle" @click="confirm">
{{ $t('disable.submit') }} {{ $t('disable.submit') }}
</base-button> </base-button>
</template> </template>

1
webapp/components/Modal/ReportModal.vue
View File

@ -35,6 +35,7 @@
<base-button <base-button
danger danger
filled
class="confirm" class="confirm"
icon="exclamation-circle" icon="exclamation-circle"
:disabled="!form.reasonCategory" :disabled="!form.reasonCategory"

2
webapp/components/ReleaseModal/ReleaseModal.vue
View File

@ -5,7 +5,7 @@
<template slot="footer"> <template slot="footer">
<base-button class="cancel" @click="cancel">{{ $t('release.cancel') }}</base-button> <base-button class="cancel" @click="cancel">{{ $t('release.cancel') }}</base-button>
<base-button danger class="confirm" icon="exclamation-circle" @click="confirm"> <base-button danger filled class="confirm" icon="exclamation-circle" @click="confirm">
{{ $t('release.submit') }} {{ $t('release.submit') }}
</base-button> </base-button>
</template> </template>

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

@ -18,6 +18,7 @@
size="small" size="small"
circle circle
danger danger
filled
@click="cancelCrop" @click="cancelCrop"
/> />
</div> </div>

1
webapp/components/features/ReportRow/ReportRow.vue
View File

@ -64,6 +64,7 @@
<base-button <base-button
v-else v-else
danger danger
filled
data-test="confirm" data-test="confirm"
size="small" size="small"
:icon="statusIconName" :icon="statusIconName"

2
webapp/pages/settings/my-social-media.vue
View File

@ -57,7 +57,7 @@
<base-button filled :disabled="disabled" type="submit"> <base-button filled :disabled="disabled" type="submit">
{{ editingLink.id ? $t('actions.save') : $t('settings.social-media.submit') }} {{ editingLink.id ? $t('actions.save') : $t('settings.social-media.submit') }}
</base-button> </base-button>
<base-button v-if="editingLink.id" id="cancel" ghost @click="handleCancel()"> <base-button v-if="editingLink.id" id="cancel" danger @click="handleCancel()">
{{ $t('actions.cancel') }} {{ $t('actions.cancel') }}
</base-button> </base-button>
</ds-space> </ds-space>