krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

move delete task btn outside of advanced settings

Browse Source
This commit is contained in:
Matteo Pagliazzi
2018-01-17 19:27:53 +01:00
parent c3220e7c03
commit 9e615ba862
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/client/components/tasks/taskModal.vue
View File

@@ -186,10 +186,6 @@
@change="updateRequiresApproval" @change="updateRequiresApproval"
) )
.reward-delete.delete-task-btn.d-flex.justify-content-center.align-items-middle(@click="destroy()", v-if="task.type === 'reward' && purpose !== 'create'")
.svg-icon.d-inline-b(v-html="icons.destroy")
span {{ $t('deleteTask') }}
.advanced-settings(v-if="task.type !== 'reward'") .advanced-settings(v-if="task.type !== 'reward'")
.advanced-settings-toggle.d-flex.justify-content-between.align-items-center(@click = "showAdvancedOptions = !showAdvancedOptions") .advanced-settings-toggle.d-flex.justify-content-between.align-items-center(@click = "showAdvancedOptions = !showAdvancedOptions")
h3 {{ $t('advancedSettings') }} h3 {{ $t('advancedSettings') }}
@@ -233,10 +229,9 @@
.custom-control.custom-radio.custom-control-inline(v-for="attr in ATTRIBUTES", :key="attr") .custom-control.custom-radio.custom-control-inline(v-for="attr in ATTRIBUTES", :key="attr")
input.custom-control-input(:id="`attribute-${attr}`", type="radio", :value="attr", v-model="task.attribute") input.custom-control-input(:id="`attribute-${attr}`", type="radio", :value="attr", v-model="task.attribute")
label.custom-control-label.attr-description(:for="`attribute-${attr}`", v-once, v-b-popover.hover="$t(`${attr}Text`)") {{ $t(attributesStrings[attr]) }} label.custom-control-label.attr-description(:for="`attribute-${attr}`", v-once, v-b-popover.hover="$t(`${attr}Text`)") {{ $t(attributesStrings[attr]) }}
.delete-task-btn.d-flex.justify-content-center.align-items-middle(@click="destroy()", v-if="purpose !== 'create'")
.delete-task-btn.d-flex.justify-content-center.align-items-middle(@click="destroy()", v-if="purpose !== 'create'") .svg-icon.d-inline-b(v-html="icons.destroy")
.svg-icon.d-inline-b(v-html="icons.destroy") span {{ $t('deleteTask') }}
span {{ $t('deleteTask') }}
.task-modal-footer.d-flex.justify-content-center.align-items-center(slot="modal-footer") .task-modal-footer.d-flex.justify-content-center.align-items-center(slot="modal-footer")
span.cancel-task-btn(v-once, @click="cancel()") {{ $t('cancel') }} span.cancel-task-btn(v-once, @click="cancel()") {{ $t('cancel') }}
@@ -556,12 +551,9 @@
} }
} }
.reward-delete { .delete-task-btn, .cancel-task-btn {
margin-top: 32px; margin-top: 32px;
margin-bottom: 8px; margin-bottom: 8px;
}
.delete-task-btn, .cancel-task-btn {
cursor: pointer; cursor: pointer;
&:hover, &:focus, &:active { &:hover, &:focus, &:active {
@@ -599,6 +591,7 @@
margin-left: -23px; margin-left: -23px;
margin-right: -23px; margin-right: -23px;
padding: 16px 24px; padding: 16px 24px;
margin-bottom: -8px;
&-toggle { &-toggle {
cursor: pointer; cursor: pointer;