From b4d85d4f693975fb28bca5e78178940fac728694 Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Thu, 31 Dec 2020 11:46:07 +0900 Subject: [PATCH] :art: --- src/client/pages/welcome.entrance.b.vue | 28 +++++++++++++++++++++---- src/client/pages/welcome.entrance.c.vue | 3 ++- src/client/pages/welcome.vue | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/client/pages/welcome.entrance.b.vue b/src/client/pages/welcome.entrance.b.vue index b1f354a326..8a6f60e726 100644 --- a/src/client/pages/welcome.entrance.b.vue +++ b/src/client/pages/welcome.entrance.b.vue @@ -15,7 +15,15 @@ <MkButton class="signup" @click="signup()" inline primary>{{ $ts.signup }}</MkButton> <MkButton class="signin" @click="signin()" inline>{{ $ts.login }}</MkButton> </div> - <div class="status" v-if="onlineUsersCount"> + <div class="status" v-if="onlineUsersCount && stats"> + <div> + <I18n :src="$ts.nUsers" text-tag="span" class="users"> + <template #n><b>{{ number(stats.originalUsersCount) }}</b></template> + </I18n> + <I18n :src="$ts.nNotes" text-tag="span" class="notes"> + <template #n><b>{{ number(stats.originalNotesCount) }}</b></template> + </I18n> + </div> <I18n :src="$ts.onlineUsersCount" text-tag="span" class="online"> <template #n><b>{{ onlineUsersCount }}</b></template> </I18n> @@ -167,7 +175,7 @@ export default defineComponent({ > .main { position: relative; - width: min(490px, 100%); + width: min(450px, 100%); padding: 64px; color: #fff; font-size: 1.1em; @@ -178,7 +186,7 @@ export default defineComponent({ > h1 { display: block; - margin: 0 0 16px 0; + margin: 0 0 32px 0; padding: 0; > .logo { @@ -194,6 +202,10 @@ export default defineComponent({ > .action { margin: 32px 0; + > * { + line-height: 32px; + } + > .signup { background: var(--panel); color: var(--fg); @@ -207,9 +219,17 @@ export default defineComponent({ > .status { margin: 32px 0; + border-top: solid 1px rgba(255, 255, 255, 0.5); + font-size: 90%; - > .online { + > div { + padding: 16px 0; + > span:not(:last-child) { + padding-right: 1em; + margin-right: 1em; + border-right: solid 1px rgba(255, 255, 255, 0.5); + } } } } diff --git a/src/client/pages/welcome.entrance.c.vue b/src/client/pages/welcome.entrance.c.vue index 2edd6401d6..e9df492cb6 100644 --- a/src/client/pages/welcome.entrance.c.vue +++ b/src/client/pages/welcome.entrance.c.vue @@ -295,9 +295,10 @@ export default defineComponent({ margin-top: 20px; color: #fff; text-shadow: 0 0 8px black; + font-size: 0.9em; > *:not(:last-child) { - margin-right: 1em; + margin-right: 1.5em; } } } diff --git a/src/client/pages/welcome.vue b/src/client/pages/welcome.vue index 03b8e8d0b8..99560eea21 100644 --- a/src/client/pages/welcome.vue +++ b/src/client/pages/welcome.vue @@ -8,7 +8,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import XSetup from './welcome.setup.vue'; -import XEntrance from './welcome.entrance.c.vue'; +import XEntrance from './welcome.entrance.a.vue'; import { instanceName } from '@/config'; import * as os from '@/os';