ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'main' into feature/date-math

Browse Source
This commit is contained in:
kolaente
2022-02-27 16:40:49 +01:00
parent d5f0158b04 b144802203
commit a8ee54d626
11 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/list/ListKanban.vue
View File

@ -616,7 +616,7 @@ $crazy-height-calculation-tasks: '#{$crazy-height-calculation} - 1rem - 2.5rem -
$filter-container-height: '1rem - #{$switch-view-height}';
// FIXME:
.app-content.list\.kanban {
.app-content.list\.kanban, .app-content.task\.detail {
padding-bottom: 0 !important;
}
@ -653,17 +653,22 @@ $filter-container-height: '1rem - #{$switch-view-height}';
border-radius: $radius;
}
}
.sortable-chosen .task {
transform: rotate(3deg);
}
.bucket {
border-radius: $radius;
position: relative;
margin: 0 $bucket-right-margin 0 0;
max-height: 100%;
max-height: calc(100% - 1rem); // 1rem spacing to the bottom
min-height: 20px;
width: $bucket-width;
display: flex;
flex-direction: column;
overflow: hidden; // Make sure the edges are always rounded
.tasks {
overflow: hidden auto;
@ -764,6 +769,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
background-color: var(--grey-100);
border-bottom-left-radius: $radius;
border-bottom-right-radius: $radius;
transform: none;
.button {
background-color: transparent;
@ -775,6 +781,7 @@ $filter-container-height: '1rem - #{$switch-view-height}';
}
}
// FIXME: This does not seem to work
.task-dragging {
transform: rotateZ(3deg);
transition: transform 0.18s ease;

3
src/views/list/ListWrapper.vue
View File

@ -139,6 +139,7 @@ async function loadList(listIdToLoad: number) {
@media screen and (max-width: $tablet) {
display: flex;
justify-content: center;
flex-direction: column;
}
}
@ -149,7 +150,7 @@ async function loadList(listIdToLoad: number) {
font-size: .75rem;
box-shadow: var(--shadow-sm);
height: $switch-view-height;
margin-bottom: 1rem;
margin: 0 auto 1rem;
padding: .5rem;
a {

6
src/views/user/settings/General.vue
View File

@ -135,7 +135,7 @@
import {computed, watch, ref} from 'vue'
import {useI18n} from 'vue-i18n'
import {playSoundWhenDoneKey, playPop} from '@/helpers/playPop'
import {playSoundWhenDoneKey, playPopSound} from '@/helpers/playPop'
import {availableLanguages} from '@/i18n'
import {getQuickAddMagicMode, setQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
import {PrefixMode} from '@/modules/parseTaskText'
@ -230,13 +230,13 @@ export default {
watch: {
playSoundWhenDone(play) {
if (play) {
playPop()
playPopSound()
}
},
},
methods: {
async updateSettings() {
localStorage.setItem(playSoundWhenDoneKey, this.playSoundWhenDone)
localStorage.setItem(playSoundWhenDoneKey, this.playSoundWhenDone ? 'true' : 'false')
setQuickAddMagicMode(this.quickAddMagicMode)
await this.$store.dispatch('auth/saveUserSettings', {