- cancel/resume subscription fix

- upload into root folder fix
- custom color theme part 3
This commit is contained in:
Peter Papp
2021-03-25 15:46:34 +01:00
parent ac6b2b09e1
commit 254a00e18e
30 changed files with 101 additions and 191 deletions

View File

@@ -169,7 +169,7 @@
@media (prefers-color-scheme: dark) {
.popup-wrapper {
background: $dark_mode_background;
background: $dark_mode_foreground;
}
.popup-content {
.title {

View File

@@ -120,9 +120,15 @@
}
polyline, path {
stroke: $theme;
color: inherit;
}
}
}
.popup-wrapper {
.button-base.secondary {
background: lighten($dark_mode_foreground, 3%);
}
}
}
</style>

View File

@@ -46,38 +46,12 @@ import { events } from '@/bus'
&.showed {
display: block;
}
/deep/.menu-option {
&:hover {
background: $light_background;
.text-label {
color: $theme;
}
path,
/deep/ line,
/deep/ polyline,
rect,
circle,
polygon {
stroke: $theme !important;
}
}
}
}
@media (prefers-color-scheme: dark) {
.sorting-preview {
background: $dark_mode_foreground;
/deep/ .menu-option {
&:hover {
background: rgba($theme, 0.1);
}
}
}
}

View File

@@ -214,18 +214,5 @@
}
}
}
.sharelink {
.lock-icon {
&:hover {
path, rect {
stroke: $theme;
}
}
}
}
}
</style>

View File

@@ -59,14 +59,14 @@
</div>
<span @click.stop="showItemActions" class="show-actions" v-if="$isMobile() && ! multiSelectMode && canShowMobileOptions">
<FontAwesomeIcon icon="ellipsis-h" class="icon-action"></FontAwesomeIcon>
<MoreHorizontalIcon icon="ellipsis-h" size="16" class="icon-action text-theme"/>
</span>
</div>
</div>
</template>
<script>
import {LinkIcon, UserPlusIcon, CheckIcon} from 'vue-feather-icons'
import {LinkIcon, UserPlusIcon, CheckIcon, MoreHorizontalIcon} from 'vue-feather-icons'
import FolderIcon from '@/components/FilesView/FolderIcon'
import {debounce} from 'lodash'
import {mapGetters} from 'vuex'
@@ -76,6 +76,7 @@ export default {
name: 'FileItemGrid',
props: ['item'],
components: {
MoreHorizontalIcon,
UserPlusIcon,
CheckIcon,
LinkIcon,
@@ -349,8 +350,8 @@ export default {
@include font-size(12);
}
path {
fill: $theme;
circle {
color: inherit;
}
}

View File

@@ -64,7 +64,7 @@
<transition name="slide-from-right">
<div class="actions" v-if="$isMobile() && ! mobileMultiSelect">
<span @click.stop="showItemActions" class="show-actions">
<FontAwesomeIcon icon="ellipsis-v" class="icon-action"></FontAwesomeIcon>
<MoreVerticalIcon size="16" class="icon-action text-theme" />
</span>
</div>
</transition>
@@ -73,7 +73,7 @@
</template>
<script>
import { LinkIcon, UserPlusIcon, CheckIcon } from 'vue-feather-icons'
import { LinkIcon, UserPlusIcon, CheckIcon, MoreVerticalIcon } from 'vue-feather-icons'
import FolderIcon from '@/components/FilesView/FolderIcon'
import { debounce } from 'lodash'
import { mapGetters } from 'vuex'
@@ -83,6 +83,7 @@ export default {
name: 'FileItemList',
props: ['item'],
components: {
MoreVerticalIcon,
UserPlusIcon,
LinkIcon,
FolderIcon,
@@ -367,8 +368,8 @@ export default {
.icon-action {
@include font-size(14);
path {
fill: $theme;
circle {
color: inherit;
}
}
}
@@ -580,10 +581,6 @@ export default {
&.is-clicked {
background: $dark_mode_foreground;
.item-name .name {
color: $theme;
}
.file-icon {
path {
fill: $dark_mode_background;

View File

@@ -1,18 +1,18 @@
<template>
<button class="mobile-action-button">
<div class="flex">
<credit-card-icon v-if="icon === 'credit-card'" size="15" class="icon"></credit-card-icon>
<folder-plus-icon v-if="icon === 'folder-plus'" size="15" class="icon"></folder-plus-icon>
<list-icon v-if="icon === 'th-list'" size="15" class="icon"></list-icon>
<trash-icon v-if="icon === 'trash'" size="15" class="icon"></trash-icon>
<grid-icon v-if="icon === 'th'" size="15" class="icon"></grid-icon>
<user-plus-icon v-if="icon === 'user-plus'" size="15" class="icon"></user-plus-icon>
<plus-icon v-if="icon === 'plus'" size="15" class="icon"></plus-icon>
<check-square-icon v-if="icon === 'check-square'" size="15" class="icon"></check-square-icon>
<x-square-icon v-if="icon === 'x-square'" size="15" class="icon"></x-square-icon>
<check-icon v-if="icon === 'check'" size="15" class="icon"></check-icon>
<dollar-sign-icon v-if="icon === 'dollar-sign'" size="15" class="icon"></dollar-sign-icon>
<sorting-and-preview-icon v-if="icon === 'preview-sorting'" size="15" class="icon preview-sorting"></sorting-and-preview-icon>
<credit-card-icon v-if="icon === 'credit-card'" size="15" class="icon dark-text-theme" />
<folder-plus-icon v-if="icon === 'folder-plus'" size="15" class="icon dark-text-theme" />
<list-icon v-if="icon === 'th-list'" size="15" class="icon dark-text-theme" />
<trash-icon v-if="icon === 'trash'" size="15" class="icon dark-text-theme" />
<grid-icon v-if="icon === 'th'" size="15" class="icon dark-text-theme" />
<user-plus-icon v-if="icon === 'user-plus'" size="15" class="icon dark-text-theme" />
<plus-icon v-if="icon === 'plus'" size="15" class="icon dark-text-theme" />
<check-square-icon v-if="icon === 'check-square'" size="15" class="icon dark-text-theme" />
<x-square-icon v-if="icon === 'x-square'" size="15" class="icon dark-text-theme" />
<check-icon v-if="icon === 'check'" size="15" class="icon dark-text-theme" />
<dollar-sign-icon v-if="icon === 'dollar-sign'" size="15" class="icon dark-text-theme" />
<sorting-and-preview-icon v-if="icon === 'preview-sorting'" size="15" class="icon preview-sorting" />
<span class="label">
<slot></slot>
</span>
@@ -103,7 +103,7 @@
background: $dark_mode_foreground;
path, line, polyline, rect, circle {
stroke: $theme;
color: inherit;
}
.label {

View File

@@ -315,11 +315,11 @@ export default {
computed: {
...mapGetters(['fileInfoDetail', 'user']),
favourites() {
return this.user.relationships.favourites.data.attributes.folders
return this.user.data.relationships.favourites.data.attributes.folders
},
isInFavourites() {
return this.favourites.find(
(el) => el.unique_id == this.fileInfoDetail[0].unique_id
(el) => el.id == this.fileInfoDetail[0].id
)
},
isFile() {
@@ -369,7 +369,7 @@ export default {
if (
this.favourites &&
!this.favourites.find(
(el) => el.unique_id == this.fileInfoDetail[0].unique_id
(el) => el.id == this.fileInfoDetail[0].id
)
) {
this.$store.dispatch('addToFavourites', this.fileInfoDetail[0])

View File

@@ -82,12 +82,6 @@ export default {
color: $dark_mode_text_secondary;
}
}
.icon-wrapper {
.icon {
stroke: $theme;
}
}
}
}
</style>

View File

@@ -106,16 +106,12 @@ import {
}
}
@media (prefers-color-scheme: dark) {
.danger {
&:hover {
background: rgba($danger, 0.1) !important;
}
}
.menu-option {
color: $dark_mode_text_primary;
&:hover {
background: rgba($theme, 0.1);
background: lighten($dark_mode_foreground, 2%);
}
}
}

View File

@@ -103,7 +103,7 @@ export default {
@media (prefers-color-scheme: dark) {
.popup-wrapper {
background: $dark_mode_background;
background: $dark_mode_foreground;
}
.popup-content {
.title {