From 251629ab612e3345843b9a49dd29e01787310972 Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Sat, 22 Sep 2018 15:58:11 +0900 Subject: [PATCH] :art: --- .../app/common/views/widgets/broadcast.vue | 58 ++++++++++--------- .../app/desktop/views/components/calendar.vue | 3 +- .../desktop/views/components/note-detail.vue | 3 +- .../app/desktop/views/components/timeline.vue | 4 +- .../desktop/views/components/ui.header.vue | 2 +- .../views/components/widget-container.vue | 5 +- .../pages/user/user.followers-you-know.vue | 3 +- .../desktop/views/pages/user/user.friends.vue | 3 +- .../desktop/views/pages/user/user.header.vue | 3 +- .../desktop/views/pages/user/user.photos.vue | 3 +- .../desktop/views/pages/user/user.profile.vue | 3 +- .../app/desktop/views/pages/user/user.vue | 6 +- .../app/desktop/views/widgets/profile.vue | 48 ++++++++------- 13 files changed, 67 insertions(+), 77 deletions(-) diff --git a/src/client/app/common/views/widgets/broadcast.vue b/src/client/app/common/views/widgets/broadcast.vue index f2fa720f52..c471229f15 100644 --- a/src/client/app/common/views/widgets/broadcast.vue +++ b/src/client/app/common/views/widgets/broadcast.vue @@ -1,25 +1,30 @@ <template> -<div class="anltbovirfeutcigvwgmgxipejaeozxi" - :data-found="announcements && announcements.length != 0" - :data-melt="props.design == 1" - :data-mobile="platform == 'mobile'" -> - <div class="icon"> - <svg height="32" version="1.1" viewBox="0 0 32 32" width="32"> - <path class="tower" d="M16.04,11.24c1.79,0,3.239-1.45,3.239-3.24S17.83,4.76,16.04,4.76c-1.79,0-3.24,1.45-3.24,3.24 C12.78,9.78,14.24,11.24,16.04,11.24z M16.04,13.84c-0.82,0-1.66-0.2-2.4-0.6L7.34,29.98h2.98l1.72-2h8l1.681,2H24.7L18.42,13.24 C17.66,13.64,16.859,13.84,16.04,13.84z M16.02,14.8l2.02,7.2h-4L16.02,14.8z M12.04,25.98l2-2h4l2,2H12.04z"></path> - <path class="wave a" d="M4.66,1.04c-0.508-0.508-1.332-0.508-1.84,0c-1.86,1.92-2.8,4.44-2.8,6.94c0,2.52,0.94,5.04,2.8,6.96 c0.5,0.52,1.32,0.52,1.82,0s0.5-1.36,0-1.88C3.28,11.66,2.6,9.82,2.6,7.98S3.28,4.3,4.64,2.9C5.157,2.391,5.166,1.56,4.66,1.04z"></path> - <path class="wave b" d="M9.58,12.22c0.5-0.5,0.5-1.34,0-1.84C8.94,9.72,8.62,8.86,8.62,8s0.32-1.72,0.96-2.38c0.5-0.52,0.5-1.34,0-1.84 C9.346,3.534,9.02,3.396,8.68,3.4c-0.32,0-0.66,0.12-0.9,0.38C6.64,4.94,6.08,6.48,6.08,8s0.58,3.06,1.7,4.22 C8.28,12.72,9.1,12.72,9.58,12.22z"></path> - <path class="wave c" d="M22.42,3.78c-0.5,0.5-0.5,1.34,0,1.84c0.641,0.66,0.96,1.52,0.96,2.38s-0.319,1.72-0.96,2.38c-0.5,0.52-0.5,1.34,0,1.84 c0.487,0.497,1.285,0.505,1.781,0.018c0.007-0.006,0.013-0.012,0.02-0.018c1.139-1.16,1.699-2.7,1.699-4.22s-0.561-3.06-1.699-4.22 c-0.494-0.497-1.297-0.5-1.794-0.007C22.424,3.775,22.422,3.778,22.42,3.78z"></path> - <path class="wave d" d="M29.18,1.06c-0.479-0.502-1.273-0.522-1.775-0.044c-0.016,0.015-0.029,0.029-0.045,0.044c-0.5,0.52-0.5,1.36,0,1.88 c1.361,1.4,2.041,3.24,2.041,5.08s-0.68,3.66-2.041,5.08c-0.5,0.52-0.5,1.36,0,1.88c0.509,0.508,1.332,0.508,1.841,0 c1.86-1.92,2.8-4.44,2.8-6.96C31.99,5.424,30.98,2.931,29.18,1.06z"></path> - </svg> - </div> - <p class="fetching" v-if="fetching">%i18n:@fetching%<mk-ellipsis/></p> - <h1 v-if="!fetching">{{ announcements.length == 0 ? '%i18n:@no-broadcasts%' : announcements[i].title }}</h1> - <p v-if="!fetching"> - <span v-if="announcements.length != 0" v-html="announcements[i].text"></span> - <template v-if="announcements.length == 0">%i18n:@have-a-nice-day%</template> - </p> - <a v-if="announcements.length > 1" @click="next">%i18n:@next% >></a> +<div class="anltbovirfeutcigvwgmgxipejaeozxi"> + <mk-widget-container :show-header="false" :naked="props.design == 1"> + <div class="anltbovirfeutcigvwgmgxipejaeozxi-body" + :data-found="announcements && announcements.length != 0" + :data-melt="props.design == 1" + :data-mobile="platform == 'mobile'" + :data-darkmode="$store.state.device.darkmode" + > + <div class="icon"> + <svg height="32" version="1.1" viewBox="0 0 32 32" width="32"> + <path class="tower" d="M16.04,11.24c1.79,0,3.239-1.45,3.239-3.24S17.83,4.76,16.04,4.76c-1.79,0-3.24,1.45-3.24,3.24 C12.78,9.78,14.24,11.24,16.04,11.24z M16.04,13.84c-0.82,0-1.66-0.2-2.4-0.6L7.34,29.98h2.98l1.72-2h8l1.681,2H24.7L18.42,13.24 C17.66,13.64,16.859,13.84,16.04,13.84z M16.02,14.8l2.02,7.2h-4L16.02,14.8z M12.04,25.98l2-2h4l2,2H12.04z"></path> + <path class="wave a" d="M4.66,1.04c-0.508-0.508-1.332-0.508-1.84,0c-1.86,1.92-2.8,4.44-2.8,6.94c0,2.52,0.94,5.04,2.8,6.96 c0.5,0.52,1.32,0.52,1.82,0s0.5-1.36,0-1.88C3.28,11.66,2.6,9.82,2.6,7.98S3.28,4.3,4.64,2.9C5.157,2.391,5.166,1.56,4.66,1.04z"></path> + <path class="wave b" d="M9.58,12.22c0.5-0.5,0.5-1.34,0-1.84C8.94,9.72,8.62,8.86,8.62,8s0.32-1.72,0.96-2.38c0.5-0.52,0.5-1.34,0-1.84 C9.346,3.534,9.02,3.396,8.68,3.4c-0.32,0-0.66,0.12-0.9,0.38C6.64,4.94,6.08,6.48,6.08,8s0.58,3.06,1.7,4.22 C8.28,12.72,9.1,12.72,9.58,12.22z"></path> + <path class="wave c" d="M22.42,3.78c-0.5,0.5-0.5,1.34,0,1.84c0.641,0.66,0.96,1.52,0.96,2.38s-0.319,1.72-0.96,2.38c-0.5,0.52-0.5,1.34,0,1.84 c0.487,0.497,1.285,0.505,1.781,0.018c0.007-0.006,0.013-0.012,0.02-0.018c1.139-1.16,1.699-2.7,1.699-4.22s-0.561-3.06-1.699-4.22 c-0.494-0.497-1.297-0.5-1.794-0.007C22.424,3.775,22.422,3.778,22.42,3.78z"></path> + <path class="wave d" d="M29.18,1.06c-0.479-0.502-1.273-0.522-1.775-0.044c-0.016,0.015-0.029,0.029-0.045,0.044c-0.5,0.52-0.5,1.36,0,1.88 c1.361,1.4,2.041,3.24,2.041,5.08s-0.68,3.66-2.041,5.08c-0.5,0.52-0.5,1.36,0,1.88c0.509,0.508,1.332,0.508,1.841,0 c1.86-1.92,2.8-4.44,2.8-6.96C31.99,5.424,30.98,2.931,29.18,1.06z"></path> + </svg> + </div> + <p class="fetching" v-if="fetching">%i18n:@fetching%<mk-ellipsis/></p> + <h1 v-if="!fetching">{{ announcements.length == 0 ? '%i18n:@no-broadcasts%' : announcements[i].title }}</h1> + <p v-if="!fetching"> + <span v-if="announcements.length != 0" v-html="announcements[i].text"></span> + <template v-if="announcements.length == 0">%i18n:@have-a-nice-day%</template> + </p> + <a v-if="announcements.length > 1" @click="next">%i18n:@next% >></a> + </div> + </mk-widget-container> </div> </template> @@ -68,11 +73,10 @@ export default define({ <style lang="stylus" scoped> root(isDark) padding 10px - border solid 1px #4078c0 - border-radius 6px + background isDark ? #253a50 : #f3f9ff &[data-melt] - border none + background transparent &[data-found] padding-left 50px @@ -133,7 +137,7 @@ root(isDark) z-index 1 margin 0 font-size 0.7em - color isDark ? #fff : #555 + color isDark ? #fff : #57616f &.fetching text-align center @@ -146,10 +150,10 @@ root(isDark) > p color #fff -.anltbovirfeutcigvwgmgxipejaeozxi[data-darkmode] +.anltbovirfeutcigvwgmgxipejaeozxi-body[data-darkmode] root(true) -.anltbovirfeutcigvwgmgxipejaeozxi:not([data-darkmode]) +.anltbovirfeutcigvwgmgxipejaeozxi-body:not([data-darkmode]) root(false) </style> diff --git a/src/client/app/desktop/views/components/calendar.vue b/src/client/app/desktop/views/components/calendar.vue index de9650b21b..0280f07a61 100644 --- a/src/client/app/desktop/views/components/calendar.vue +++ b/src/client/app/desktop/views/components/calendar.vue @@ -133,8 +133,7 @@ export default Vue.extend({ root(isDark) color isDark ? #c5ced6 : #777 background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) overflow hidden &[data-melt] diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index 7307eeb7dc..670be422fe 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -231,8 +231,7 @@ root(isDark) overflow hidden text-align left background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.1) - border-radius 8px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) > .read-more display block diff --git a/src/client/app/desktop/views/components/timeline.vue b/src/client/app/desktop/views/components/timeline.vue index 7d683236bb..75324c6b1d 100644 --- a/src/client/app/desktop/views/components/timeline.vue +++ b/src/client/app/desktop/views/components/timeline.vue @@ -179,14 +179,12 @@ export default Vue.extend({ root(isDark) background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) > header padding 0 8px z-index 10 background isDark ? #313543 : #fff - border-radius 6px 6px 0 0 box-shadow 0 1px isDark ? rgba(#000, 0.15) : rgba(#000, 0.08) > .buttons diff --git a/src/client/app/desktop/views/components/ui.header.vue b/src/client/app/desktop/views/components/ui.header.vue index ac8a6c7765..f1e37cc577 100644 --- a/src/client/app/desktop/views/components/ui.header.vue +++ b/src/client/app/desktop/views/components/ui.header.vue @@ -125,7 +125,7 @@ root(isDark) top 0 z-index 1000 width 100% - box-shadow 0 1px 1px rgba(#000, 0.075) + box-shadow 0 0px 8px rgba(#000, 0.2) > .warn display block diff --git a/src/client/app/desktop/views/components/widget-container.vue b/src/client/app/desktop/views/components/widget-container.vue index 7cfcd68eba..f9f07a919c 100644 --- a/src/client/app/desktop/views/components/widget-container.vue +++ b/src/client/app/desktop/views/components/widget-container.vue @@ -36,13 +36,12 @@ export default Vue.extend({ <style lang="stylus" scoped> root(isDark) background isDark ? #282C37 : #fff - border solid 1px rgba(#000, isDark ? 0.2 : 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) overflow hidden &.naked background transparent !important - border none !important + box-shadow none !important > header background isDark ? #313543 : #fff diff --git a/src/client/app/desktop/views/pages/user/user.followers-you-know.vue b/src/client/app/desktop/views/pages/user/user.followers-you-know.vue index 0e7e3f1d77..1c848000b2 100644 --- a/src/client/app/desktop/views/pages/user/user.followers-you-know.vue +++ b/src/client/app/desktop/views/pages/user/user.followers-you-know.vue @@ -38,8 +38,7 @@ export default Vue.extend({ <style lang="stylus" scoped> root(isDark) background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) > .title z-index 1 diff --git a/src/client/app/desktop/views/pages/user/user.friends.vue b/src/client/app/desktop/views/pages/user/user.friends.vue index a238565588..499a276bfe 100644 --- a/src/client/app/desktop/views/pages/user/user.friends.vue +++ b/src/client/app/desktop/views/pages/user/user.friends.vue @@ -42,8 +42,7 @@ export default Vue.extend({ <style lang="stylus" scoped> root(isDark) background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) overflow hidden > .title diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue index 4b434ec219..ac7057d3b4 100644 --- a/src/client/app/desktop/views/pages/user/user.header.vue +++ b/src/client/app/desktop/views/pages/user/user.header.vue @@ -104,8 +104,7 @@ export default Vue.extend({ root(isDark) background isDark ? #282C37 : #fff - border 1px solid rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) overflow hidden &[data-is-dark-background] diff --git a/src/client/app/desktop/views/pages/user/user.photos.vue b/src/client/app/desktop/views/pages/user/user.photos.vue index d4c5a47f92..fd4e5813b2 100644 --- a/src/client/app/desktop/views/pages/user/user.photos.vue +++ b/src/client/app/desktop/views/pages/user/user.photos.vue @@ -41,8 +41,7 @@ export default Vue.extend({ <style lang="stylus" scoped> root(isDark) background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) overflow hidden > .title diff --git a/src/client/app/desktop/views/pages/user/user.profile.vue b/src/client/app/desktop/views/pages/user/user.profile.vue index efd5be4672..7674df3884 100644 --- a/src/client/app/desktop/views/pages/user/user.profile.vue +++ b/src/client/app/desktop/views/pages/user/user.profile.vue @@ -87,8 +87,7 @@ export default Vue.extend({ <style lang="stylus" scoped> root(isDark) background isDark ? #282C37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) > *:first-child border-top none !important diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue index 89dbd41b84..89e7dbd47b 100644 --- a/src/client/app/desktop/views/pages/user/user.vue +++ b/src/client/app/desktop/views/pages/user/user.vue @@ -118,8 +118,7 @@ root(isDark) margin-right 16px > .timeline - border 1px solid rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) > .side width 275px @@ -138,8 +137,7 @@ root(isDark) font-size 12px color #aaa background isDark ? #21242f : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px + box-shadow 0 3px 8px rgba(0, 0, 0, 0.2) a color #999 diff --git a/src/client/app/desktop/views/widgets/profile.vue b/src/client/app/desktop/views/widgets/profile.vue index a22607b612..04ef18c8e3 100644 --- a/src/client/app/desktop/views/widgets/profile.vue +++ b/src/client/app/desktop/views/widgets/profile.vue @@ -1,20 +1,25 @@ <template> -<div class="mkw-profile" - :data-compact="props.design == 1 || props.design == 2" - :data-melt="props.design == 2" -> - <div class="banner" - :style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''" - title="%i18n:@update-banner%" - @click="() => os.apis.updateBanner()" - ></div> - <mk-avatar class="avatar" :user="$store.state.i" - :disable-link="true" - @click="() => os.apis.updateAvatar()" - title="%i18n:@update-avatar%" - /> - <router-link class="name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link> - <p class="username">@{{ $store.state.i | acct }}</p> +<div class="egwyvoaaryotefqhqtmiyawwefemjfsd"> + <mk-widget-container :show-header="false" :naked="props.design == 2"> + <div class="egwyvoaaryotefqhqtmiyawwefemjfsd-body" + :data-compact="props.design == 1 || props.design == 2" + :data-melt="props.design == 2" + :data-darkmode="$store.state.device.darkmode" + > + <div class="banner" + :style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''" + title="%i18n:@update-banner%" + @click="() => os.apis.updateBanner()" + ></div> + <mk-avatar class="avatar" :user="$store.state.i" + :disable-link="true" + @click="() => os.apis.updateAvatar()" + title="%i18n:@update-avatar%" + /> + <router-link class="name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link> + <p class="username">@{{ $store.state.i | acct }}</p> + </div> + </mk-widget-container> </div> </template> @@ -42,10 +47,6 @@ export default define({ <style lang="stylus" scoped> root(isDark) - overflow hidden - background isDark ? #282c37 : #fff - border solid 1px rgba(#000, 0.075) - border-radius 6px &[data-compact] > .banner:before @@ -75,9 +76,6 @@ root(isDark) display none &[data-melt] - background transparent !important - border none !important - > .banner visibility hidden @@ -120,10 +118,10 @@ root(isDark) font-size 0.9em color isDark ? #606984 : #999 -.mkw-profile[data-darkmode] +.egwyvoaaryotefqhqtmiyawwefemjfsd-body[data-darkmode] root(true) -.mkw-profile:not([data-darkmode]) +.egwyvoaaryotefqhqtmiyawwefemjfsd-body:not([data-darkmode]) root(false) </style>