krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +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

11
website/client/components/tasks/column.vue
View File

@@ -34,7 +34,7 @@
.svg-icon(v-html="icons[type]", :class="`icon-${type}`", v-once)
h3(v-once) {{$t('theseAreYourTasks', {taskType: $t(types[type].label)})}}
.small-text {{$t(`${type}sDesc`)}}
draggable(
draggable.sortable-tasks(
ref="tasksList",
@update='sorted',
:options='{disabled: activeFilters[type].label === "scheduled"}',
@@ -81,6 +81,7 @@
.reward-items {
@supports (display: grid) {
display: grid;
justify-content: center;
grid-column-gap: 16px;
grid-row-gap: 4px;
grid-template-columns: repeat(auto-fill, 94px);
@@ -90,7 +91,7 @@
display: flex;
flex-wrap: wrap;
& > div {
margin: 0 16px 4px 0;
margin: 0 16px 4px 0;
}
}
}
@@ -108,12 +109,11 @@
border-radius: 2px;
background-color: rgba($black, 0.06);
width: 100%;
margin-bottom: 8px;
margin-bottom: 3px;
padding: 12px 16px;
border-color: transparent;
transition: background 0.15s ease-in;
resize: none;
margin-bottom: 0px;
&:hover {
background-color: rgba($black, 0.1);
@@ -124,6 +124,7 @@
background: $white;
border-color: $purple-500;
color: $gray-50;
margin-bottom: 0px;
}
&::placeholder {
@@ -558,7 +559,7 @@ export default {
const tasksWrapperHeight = tasksWrapperEl.offsetHeight;
const quickAddHeight = this.$refs.quickAdd ? this.$refs.quickAdd.offsetHeight : 0;
const tasksListHeight = this.$refs.tasksList.offsetHeight;
const tasksListHeight = this.$refs.tasksList.$el.offsetHeight;
let combinedTasksHeights = tasksListHeight + quickAddHeight;