From 88804731d0499f6e1c53cc9baf4f90919f8804bd Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Mon, 20 Nov 2017 08:47:03 +0900 Subject: [PATCH] :art: --- src/web/app/desktop/tags/drive/browser.tag | 26 +++++++++++----------- src/web/app/desktop/tags/drive/file.tag | 4 +--- src/web/app/desktop/tags/drive/folder.tag | 2 -- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag index 311209fcb6..6b756b9952 100644 --- a/src/web/app/desktop/tags/drive/browser.tag +++ b/src/web/app/desktop/tags/drive/browser.tag @@ -18,12 +18,14 @@ <virtual each={ folder in folders }> <mk-drive-browser-folder class="folder" folder={ folder }/> </virtual> + <div class="padding" each={ folders }></div> <button if={ moreFolders }>%i18n:desktop.tags.mk-drive-browser.load-more%</button> </div> <div class="files" ref="filesContainer" if={ files.length > 0 }> <virtual each={ file in files }> <mk-drive-browser-file class="file" file={ file }/> </virtual> + <div class="padding" each={ files }></div> <button if={ moreFiles } onclick={ fetchMoreFiles }>%i18n:desktop.tags.mk-drive-browser.load-more%</button> </div> <div class="empty" if={ files.length == 0 && folders.length == 0 && !fetching }> @@ -161,22 +163,20 @@ > .contents > .folders - &:after - content "" - display block - clear both + > .files + display flex + flex-wrap wrap > .folder - float left - - > .files - &:after - content "" - display block - clear both - > .file - float left + flex-grow 1 + width 144px + margin 4px + + > .padding + flex-grow 1 + pointer-events none + width 144px + 8px // 8px is margin > .empty padding 16px diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag index bf9d38bd2f..0f019d95bf 100644 --- a/src/web/app/desktop/tags/drive/file.tag +++ b/src/web/app/desktop/tags/drive/file.tag @@ -10,9 +10,7 @@ <style> :scope display block - margin 4px padding 8px 0 0 0 - width 144px height 180px border-radius 4px @@ -113,7 +111,7 @@ > .thumbnail width 128px height 128px - left 8px + margin auto > img display block diff --git a/src/web/app/desktop/tags/drive/folder.tag b/src/web/app/desktop/tags/drive/folder.tag index 1c361c8e4d..6d2d196258 100644 --- a/src/web/app/desktop/tags/drive/folder.tag +++ b/src/web/app/desktop/tags/drive/folder.tag @@ -3,9 +3,7 @@ <style> :scope display block - margin 4px padding 8px - width 144px height 64px background lighten($theme-color, 95%) border-radius 4px