diff --git a/client/src/components/files.vue b/client/src/components/files.vue index b40553af..fae901ee 100644 --- a/client/src/components/files.vue +++ b/client/src/components/files.vue @@ -9,8 +9,7 @@

{{ item.name }}

{{ fileSize(item.size) }}

- +
@@ -18,29 +17,51 @@

{{ $t('files.downloads') }}

- +

{{ download.name }}

-

{{ Math.min(100, Math.round(download.progress / download.size * 100))}}%

+

{{ Math.min(100, Math.round((download.progress / download.size) * 100)) }}%

- +
-

{{ $t('files.uploads' )}}

+

{{ $t('files.uploads') }}

- +

{{ upload.name }}

-

{{ Math.min(100, Math.round(upload.progress / upload.size * 100))}}%

+

{{ Math.min(100, Math.round((upload.progress / upload.size) * 100)) }}%

- +
-
+

{{ $t('files.upload_here') }}

@@ -94,12 +115,13 @@ .files-list-item { padding: 0.5em; - border-bottom: 2px solid rgba($color: #fff, $alpha: 0.10); + border-bottom: 2px solid rgba($color: #fff, $alpha: 0.1); display: flex; flex-direction: row; } - .file-icon, .transfer-status { + .file-icon, + .transfer-status { width: 14px; margin-right: 0.5em; } @@ -115,10 +137,12 @@ .file-size { margin-left: auto; margin-right: 0.5em; - color: rgba($color: #fff, $alpha: 0.40); + color: rgba($color: #fff, $alpha: 0.4); } - .refresh:hover, .download:hover, .remove-transfer:hover { + .refresh:hover, + .download:hover, + .remove-transfer:hover { cursor: pointer; } @@ -186,8 +210,9 @@ cursor: pointer; } - .upload-area-drag, .upload-area:hover { - background-color: rgba($color: #fff, $alpha: 0.10); + .upload-area-drag, + .upload-area:hover { + background-color: rgba($color: #fff, $alpha: 0.1); } .upload-area > i { @@ -198,12 +223,10 @@ .upload-area > p { margin: 0px 10px 10px 10px; } - } diff --git a/client/src/components/settings.vue b/client/src/components/settings.vue index c95bd67d..2535cb27 100644 --- a/client/src/components/settings.vue +++ b/client/src/components/settings.vue @@ -385,7 +385,7 @@ } set file_transfer(value: boolean) { - this.$accessor.settings.setGlobalFileTransferStatus({ admin: value, unpriv: false }) + this.$accessor.settings.setRemoteFileTransferStatus({ admin: value, unpriv: false }) } get unpriv_file_transfer() { @@ -393,7 +393,7 @@ } set unpriv_file_transfer(value: boolean) { - this.$accessor.settings.setGlobalFileTransferStatus({ admin: this.file_transfer, unpriv: value }) + this.$accessor.settings.setRemoteFileTransferStatus({ admin: this.file_transfer, unpriv: value }) } get broadcast_is_active() { diff --git a/client/src/components/side.vue b/client/src/components/side.vue index 282065a9..7404a98c 100644 --- a/client/src/components/side.vue +++ b/client/src/components/side.vue @@ -79,7 +79,7 @@