From cd034207c170ae0b7e91345f671b101bd920ad6e Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle <patrizio@bekerle.com> Date: Wed, 24 Jun 2020 08:38:03 +0200 Subject: [PATCH] Move vpu-nextcloud-file-picker position --- packages/file-handling/src/fileupload.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/file-handling/src/fileupload.js b/packages/file-handling/src/fileupload.js index 5c4d6ef1..1f5a25af 100644 --- a/packages/file-handling/src/fileupload.js +++ b/packages/file-handling/src/fileupload.js @@ -434,6 +434,11 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) { #fileElem { display: none; } + + #nextcloud-file-picker { + display: inline-block; + margin-left: 10px; + } `; } @@ -454,7 +459,12 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) { multiple accept="${mimeTypesToAccept(allowedMimeTypes)}" name='file'> - <vpu-nextcloud-file-picker class="${classMap({hidden: this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}" + <label class="button is-primary" for="fileElem" ?disabled="${this.disabled}"> + <vpu-icon style="display: ${this.uploadInProgress ? "inline-block" : "none"}" name="lock"></vpu-icon> + ${this.buttonLabel || i18n.t('upload-label')} + </label> + <vpu-nextcloud-file-picker id="nextcloud-file-picker" + class="${classMap({hidden: this.nextcloudWebDavUrl === "" || this.nextcloudAuthUrl === ""})}" ?disabled="${this.uploadInProgress || this.disabled}" lang="${this.lang}" auth-url="${this.nextcloudAuthUrl}" @@ -462,10 +472,6 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) { @vpu-nextcloud-file-picker-file-downloaded="${(event) => { this.queueFile(event.detail.file); }}"></vpu-nextcloud-file-picker> - <label class="button is-primary" for="fileElem" ?disabled="${this.disabled}"> - <vpu-icon style="display: ${this.uploadInProgress ? "inline-block" : "none"}" name="lock"></vpu-icon> - ${this.buttonLabel || i18n.t('upload-label')} - </label> <vpu-mini-spinner style="display: ${this.multipleUploadInProgress ? "inline-block" : "none"}"></vpu-mini-spinner> </div> </div> -- GitLab