From d0f01ef2334421d8b724ca4d1999e543eb4b5175 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 12 Nov 2017 07:00:40 +0900 Subject: [PATCH] :art: --- .../desktop/tags/home-widgets/activity.tag | 12 ++++++--- .../desktop/tags/home-widgets/calendar.tag | 19 +++++++++++-- .../tags/home-widgets/photo-stream.tag | 19 ++++++++++--- .../app/desktop/tags/home-widgets/profile.tag | 20 +++++++++++--- .../app/desktop/tags/home-widgets/server.tag | 12 ++++++--- .../desktop/tags/home-widgets/timemachine.tag | 27 +++++++++++++++---- 6 files changed, 87 insertions(+), 22 deletions(-) diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag index 255f6442e0..fd2f4a2794 100644 --- a/src/web/app/desktop/tags/home-widgets/activity.tag +++ b/src/web/app/desktop/tags/home-widgets/activity.tag @@ -1,5 +1,5 @@ - - + +

%i18n:desktop.tags.mk-activity-home-widget.title%

@@ -11,6 +11,10 @@ display block background #fff + &[data-melt] + background transparent !important + border none !important + > .title z-index 1 margin 0 @@ -54,7 +58,7 @@ diff --git a/src/web/app/desktop/tags/home-widgets/calendar.tag b/src/web/app/desktop/tags/home-widgets/calendar.tag index 9aa4ac6326..6f45ea20f1 100644 --- a/src/web/app/desktop/tags/home-widgets/calendar.tag +++ b/src/web/app/desktop/tags/home-widgets/calendar.tag @@ -1,4 +1,4 @@ - +

{ year }年{ month }月

{ day }日

@@ -34,6 +34,10 @@ &[data-special='on-new-years-day'] border-color #ef95a0 !important + &[data-melt] + background transparent !important + border none !important + &:after content "" display block @@ -106,6 +110,12 @@ diff --git a/src/web/app/desktop/tags/home-widgets/photo-stream.tag b/src/web/app/desktop/tags/home-widgets/photo-stream.tag index 7f8dd8563a..84d0020a6b 100644 --- a/src/web/app/desktop/tags/home-widgets/photo-stream.tag +++ b/src/web/app/desktop/tags/home-widgets/photo-stream.tag @@ -1,5 +1,5 @@ - - + +

%i18n:desktop.tags.mk-photo-stream-home-widget.title%

%i18n:common.loading%

@@ -14,6 +14,17 @@ display block background #fff + &[data-melt] + background transparent !important + border none !important + + > .stream + padding 0 + + > .img + border solid 4px transparent + border-radius 8px + > .title z-index 1 margin 0 @@ -58,7 +69,7 @@ diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag index 1439a423b2..7d4cf862f6 100644 --- a/src/web/app/desktop/tags/home-widgets/profile.tag +++ b/src/web/app/desktop/tags/home-widgets/profile.tag @@ -1,4 +1,4 @@ - + avatar { I.name } @@ -36,6 +36,20 @@ > .username display none + &[data-melt] + background transparent !important + border none !important + + > .banner + visibility hidden + + > .avatar + box-shadow none + + > .name + color #666 + text-shadow none + > .banner height 100px background-color #f5f5f5 @@ -77,7 +91,7 @@ import updateBanner from '../../scripts/update-banner'; this.data = { - compact: false + design: 0 }; this.mixin('widget'); @@ -93,7 +107,7 @@ }; this.func = () => { - this.data.compact = !this.data.compact; + if (++this.data.design == 3) this.data.design = 0; this.save(); }; diff --git a/src/web/app/desktop/tags/home-widgets/server.tag b/src/web/app/desktop/tags/home-widgets/server.tag index b2e3b9d904..094af87594 100644 --- a/src/web/app/desktop/tags/home-widgets/server.tag +++ b/src/web/app/desktop/tags/home-widgets/server.tag @@ -1,5 +1,5 @@ - - + +

%i18n:desktop.tags.mk-server-home-widget.title%

@@ -15,6 +15,10 @@ display block background #fff + &[data-melt] + background transparent !important + border none !important + > .title z-index 1 margin 0 @@ -60,7 +64,7 @@ this.data = { view: 0, - compact: false + design: 0 }; this.mixin('widget'); @@ -90,7 +94,7 @@ }; this.func = () => { - this.data.compact = !this.data.compact; + if (++this.data.design == 3) this.data.design = 0; this.save(); }; diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag index 75e9f3a339..984258d2ba 100644 --- a/src/web/app/desktop/tags/home-widgets/timemachine.tag +++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag @@ -1,10 +1,12 @@ - - -

{ '%i18n:desktop.tags.mk-timemachine-home-widget.title%'.replace('{1}', year).replace('{2}', month) }

- + + + +

{ '%i18n:desktop.tags.mk-timemachine-home-widget.title%'.replace('{1}', year).replace('{2}', month) }

+ +
-
{ weekdayText[i] }
@@ -22,6 +24,10 @@ color #777 background #fff + &[data-melt] + background transparent !important + border none !important + > .title z-index 1 margin 0 @@ -130,6 +136,12 @@