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

Task Modal Improvements (#9560)

Browse Source 
* start adding advanced options

* new imput

* partial colors

* update deps

* misc adds

* fix text color

* add advanced options

* initial reordering of task modal labels

* start to fix colors in the modal

* wip colors

* update package-lock.json

* fix merge

* finish modal

* refactor colors

* fix quick add

* fix colors

* new icon colors

* add markdown formatting help

* fix habits colors

* fix rewards colors

* fixed remaining colors

* start to inline inputs

* fix typ

* fixes

* habits hover state

* wip new task modal inputs

* bootstrap: upgrade to v4-beta3

* finish reward edit modal

* fix attributes allocation, checklists and add help tooltips for attributes and difficulty

* lots of fixes

* update datepicker

* misc fixes
This commit is contained in:
Matteo Pagliazzi
2018-01-08 18:43:57 +01:00
committed by GitHub
parent daa796454c
commit 6a109adbc5
32 changed files with 967 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/client/components/tasks/user.vue
View File

@@ -18,7 +18,7 @@
:class="{active: selectedTags.length > 0}",
)
.svg-icon.filter-icon.mr-2(v-html="icons.filter")
span(v-once) {{ $t('filter') }}
span(v-once) {{ $t('tags') }}
.filter-panel(v-if="isFilterPanelOpen", v-on:mouseleave="checkMouseOver")
.tags-category.d-flex(
v-for="tagsType in tagsByType",
@@ -34,20 +34,19 @@
.col-6(v-for="(tag, tagIndex) in tagsSnap[tagsType.key]")
.inline-edit-input-group.tag-edit-item.input-group
input.tag-edit-input.inline-edit-input.form-control(type="text", v-model="tag.name")
span.input-group-btn(@click="removeTag(tagIndex, tagsType.key)")
.input-group-append(@click="removeTag(tagIndex, tagsType.key)")
.svg-icon.destroy-icon(v-html="icons.destroy")
.col-6(v-if="tagsType.key === 'tags'")
input.new-tag-item.edit-tag-item.inline-edit-input.form-control(type="text", :placeholder="$t('newTag')", @keydown.enter="addTag($event, tagsType.key)", v-model="newTag")
template(v-else)
.col-6(v-for="(tag, tagIndex) in tagsType.tags")
label.custom-control.custom-checkbox
.custom-control.custom-checkbox
input.custom-control-input(
type="checkbox",
:checked="isTagSelected(tag)",
@change="toggleTag(tag)",
@change="toggleTag(tag)", :id="`tag-${tag.id}`"
)
span.custom-control-indicator
span.custom-control-description(v-markdown='tag.name')
label.custom-control-label(v-markdown='tag.name', :for="`tag-${tag.id}`")
.filter-panel-footer.clearfix
template(v-if="editingTags === true")
@@ -228,7 +227,7 @@
.tag-edit-input {
border-bottom: 1px solid $gray-500 !important;
&:focus, &:focus ~ .input-group-btn {
&:focus, &:focus ~ .input-group-append {
border-color: $purple-500 !important;
}
}
@@ -244,7 +243,8 @@
}
.tag-edit-item {
.input-group-btn {
.input-group-append {
background: $white;
border-bottom: 1px solid $gray-500 !important;
&:focus {
@@ -261,7 +261,7 @@
}
}
.custom-control-description {
.custom-control-label {
margin-left: 10px;
}