From b032f78769d7d70b2265cb5318276fa582c20bf7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 27 Sep 2018 21:43:11 +0900 Subject: [PATCH] wip --- .../components/messaging-room.message.vue | 20 ++----- .../views/components/messaging-room.vue | 36 ++++------- .../app/mobile/views/components/ui.header.vue | 60 ------------------- src/client/theme/dark.json | 8 +++ src/client/theme/halloween.json | 1 - src/client/theme/light.json | 8 +++ 6 files changed, 30 insertions(+), 103 deletions(-) diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue index e0528d5432..77bf55c52c 100644 --- a/src/client/app/common/views/components/messaging-room.message.vue +++ b/src/client/app/common/views/components/messaging-room.message.vue @@ -59,9 +59,7 @@ export default Vue.extend({ diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue index 52abfa4e1d..98661bc39d 100644 --- a/src/client/app/common/views/components/messaging-room.vue +++ b/src/client/app/common/views/components/messaging-room.vue @@ -262,14 +262,12 @@ export default Vue.extend({ diff --git a/src/client/app/mobile/views/components/ui.header.vue b/src/client/app/mobile/views/components/ui.header.vue index b859c22887..d3e258f052 100644 --- a/src/client/app/mobile/views/components/ui.header.vue +++ b/src/client/app/mobile/views/components/ui.header.vue @@ -4,7 +4,6 @@
-

%i18n:@welcome-back%{{ $store.state.i | userName }}%i18n:@adjective%

@@ -50,53 +49,6 @@ export default Vue.extend({ this.connection.on('reversi_invited', this.onReversiInvited); this.connection.on('reversi_no_invites', this.onReversiNoInvites); - - const ago = (new Date().getTime() - new Date(this.$store.state.i.lastUsedAt).getTime()) / 1000; - const isHisasiburi = ago >= 3600; - this.$store.state.i.lastUsedAt = new Date(); - - if (isHisasiburi) { - (this.$refs.welcomeback as any).style.display = 'block'; - (this.$refs.main as any).style.overflow = 'hidden'; - - anime({ - targets: this.$refs.welcomeback, - top: '0', - opacity: 1, - delay: 1000, - duration: 500, - easing: 'easeOutQuad' - }); - - anime({ - targets: this.$refs.mainContainer, - opacity: 0, - delay: 1000, - duration: 500, - easing: 'easeOutQuad' - }); - - setTimeout(() => { - anime({ - targets: this.$refs.welcomeback, - top: '-48px', - opacity: 0, - duration: 500, - complete: () => { - (this.$refs.welcomeback as any).style.display = 'none'; - (this.$refs.main as any).style.overflow = 'initial'; - }, - easing: 'easeInQuad' - }); - - anime({ - targets: this.$refs.mainContainer, - opacity: 1, - duration: 500, - easing: 'easeInQuad' - }); - }, 2500); - } } }, beforeDestroy() { @@ -159,18 +111,6 @@ root(isDark) //background-color rgba(#1b2023, 0.75) background-color isDark ? #313543 : #595f6f - > p - display none - position absolute - z-index 1002 - top $height - width 100% - line-height $height - margin 0 - text-align center - color #fff - opacity 0 - > .content z-index 1001 diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index 0422eb021b..7a9a06187f 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -77,6 +77,14 @@ "googleSearchHoverBorder": "rgba(255, 255, 255, 0.3)", "googleSearchHoverButton": "rgba(255, 255, 255, 0.1)", + "messagingRoomBg": "@bg", + "messagingRoomInfo": "#fff", + "messagingRoomDateDividerLine": "rgba(255, 255, 255, 0.1)", + "messagingRoomDateDividerText": "rgba(255, 255, 255, 0.3)", + "messagingRoomMessageInfo": "rgba(255, 255, 255, 0.4)", + "messagingRoomMessageBg": "$secondary", + "messagingRoomMessageFg": "#fff", + "desktopHeaderBg": "#313543", "desktopHeaderFg": "#b8c5ca", "desktopHeaderHoverFg": "#fff", diff --git a/src/client/theme/halloween.json b/src/client/theme/halloween.json index 81c773f574..327d04cad6 100644 --- a/src/client/theme/halloween.json +++ b/src/client/theme/halloween.json @@ -11,7 +11,6 @@ "text": "#b1bee3" } }, - "bg": "#1b1a35", "renoteGradient": "#5d2d1a", "renoteText": "#ff6c00", "desktopHeaderBg": "#36314e" diff --git a/src/client/theme/light.json b/src/client/theme/light.json index 83e4ee05c3..ca0dad0718 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -77,6 +77,14 @@ "googleSearchHoverBorder": "rgba(0, 0, 0, 0.3)", "googleSearchHoverButton": "rgba(0, 0, 0, 0.05)", + "messagingRoomBg": "#fff", + "messagingRoomInfo": "#000", + "messagingRoomDateDividerLine": "rgba(0, 0, 0, 0.1)", + "messagingRoomDateDividerText": "rgba(0, 0, 0, 0.3)", + "messagingRoomMessageInfo": "rgba(0, 0, 0, 0.4)", + "messagingRoomMessageBg": "#eee", + "messagingRoomMessageFg": "#333", + "desktopHeaderBg": "#f7f7f7", "desktopHeaderFg": "#9eaba8", "desktopHeaderHoverFg": "#7b8c88",