Compare commits
44 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f3bacae1dc | |||
| af5fb99fe6 | |||
| 0ebe4ad7a3 | |||
| 0cf99037c8 | |||
| b913debc57 | |||
| abe3f1f5e9 | |||
| d30b88364c | |||
| 4840b7acf7 | |||
| f5bac11fae | |||
| 68a70a94fc | |||
| bf7436ddf8 | |||
| b99155a084 | |||
| 027e62a6ea | |||
| c6b6c8afbd | |||
| 1236a09247 | |||
| 6a4d38045e | |||
| 281aed2797 | |||
| 3e47f9943a | |||
| f6d27dd17d | |||
| 073704c7af | |||
| 809db02ca2 | |||
| 2e45ff6a32 | |||
| 02d6974be9 | |||
| e530afb2fe | |||
| dba15f0e8b | |||
| 8f771c60c5 | |||
| d9b1ca8c48 | |||
| 9e247c119a | |||
| 08b5e21e96 | |||
| 2101d3aa5b | |||
| aa80fb5d4a | |||
| 63727f6514 | |||
| ade35cbb2d | |||
| 6ec9059ccc | |||
| c93d1711cf | |||
| e734ad0413 | |||
| 047dee3a70 | |||
| 8c76089caf | |||
| ab6cf2dba3 | |||
| 65a309e605 | |||
| f37e713640 | |||
| bc1e9245bd | |||
| 2fa82bde16 | |||
| 140249172c |
@ -4,6 +4,10 @@
|
||||
notifications:
|
||||
email: false
|
||||
|
||||
branches:
|
||||
except:
|
||||
- l10n_master
|
||||
|
||||
language: node_js
|
||||
|
||||
node_js:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
---
|
||||
meta:
|
||||
lang: "Deutsch"
|
||||
divider: ""
|
||||
divider: " "
|
||||
common:
|
||||
misskey: "Teile alles mit anderen mithilfe von Misskey"
|
||||
time:
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "すべての通知を既読にしますか？"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -166,14 +166,14 @@ common/views/widgets/server.vue:
|
||||
title: "Server info"
|
||||
toggle: "Toggle views"
|
||||
common/views/widgets/visibility-chooser.vue:
|
||||
public: "公開"
|
||||
home: "ホーム"
|
||||
public: "Public"
|
||||
home: "Home"
|
||||
home-desc: "ホームタイムラインにのみ公開"
|
||||
followers: "フォロワー"
|
||||
followers: "Followers"
|
||||
followers-desc: "自分のフォロワーにのみ公開"
|
||||
specified: "ダイレクト"
|
||||
specified: "Direct"
|
||||
specified-desc: "指定したユーザーにのみ公開"
|
||||
private: "非公開"
|
||||
private: "Private"
|
||||
desktop/views/components/activity.chart.vue:
|
||||
total: "Black ... Total"
|
||||
notes: "Blue ... Notes"
|
||||
@ -475,8 +475,8 @@ desktop/views/components/settings.profile.vue:
|
||||
description: "Description"
|
||||
birthday: "Birthday"
|
||||
save: "Update profile"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
is-bot: "This account is a Bot"
|
||||
is-cat: "This account is a Cat"
|
||||
desktop/views/components/sub-note-content.vue:
|
||||
hidden: "(this post is private)"
|
||||
media: " media"
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "Popout"
|
||||
close: "Close"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "Log In"
|
||||
signup: "Sign up"
|
||||
signin-button: "Log in"
|
||||
signup-button: "Sign up"
|
||||
timeline: "Timeline"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "Are you sure you want to mark all unread notifications as read?"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "Profile"
|
||||
will-be-published: "※公開されます"
|
||||
name: "Name"
|
||||
account: "Account"
|
||||
location: "Location"
|
||||
@ -684,8 +689,7 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "Birthday"
|
||||
avatar: "Avatar"
|
||||
banner: "Banner"
|
||||
is-bot: "This account is a Bot"
|
||||
is-cat: "このアカウントはCatです"
|
||||
is-cat: "This account is a Cat"
|
||||
save: "Update profile"
|
||||
saved: "Profile updated successfully"
|
||||
uploading: "Uploading"
|
||||
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "すべての通知を既読にしますか？"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
---
|
||||
meta:
|
||||
lang: "日本語"
|
||||
divider: ""
|
||||
lang: "Français"
|
||||
divider: " "
|
||||
common:
|
||||
misskey: "Partagez avec les autres en utilisant Misskey"
|
||||
time:
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "Êtes vous sûr de vouloir marqués toutes les notifications non-lus en tant que lus?"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "すべての通知を既読にしますか？"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -612,6 +612,13 @@ desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
|
||||
@ -807,7 +814,6 @@ mobile/views/pages/notifications.vue:
|
||||
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -815,7 +821,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "すべての通知を既読にしますか？"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
---
|
||||
meta:
|
||||
lang: "japoński"
|
||||
divider: ""
|
||||
lang: "język polski"
|
||||
divider: " "
|
||||
common:
|
||||
misskey: "Dziel się zawartością z innymi korzystając z Misskey."
|
||||
time:
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Dysk Misskey"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "Czy na pewno chcesz oznaczyć wszystkie powiadomienia jako przeczytane?"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "Profil"
|
||||
will-be-published: "※公開されます"
|
||||
name: "Nazwa"
|
||||
account: "Konto"
|
||||
location: "Lokalizacja"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "Data urodzenia"
|
||||
avatar: "Awatar"
|
||||
banner: "Baner"
|
||||
is-bot: "To konto jest botem"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "Aktualizuj profil"
|
||||
saved: "Pomyślnie zaktualizowano profil"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
---
|
||||
meta:
|
||||
lang: "日本語"
|
||||
divider: ""
|
||||
lang: "Русский язык"
|
||||
divider: " "
|
||||
common:
|
||||
misskey: "Misskeyで皆と共有しよう。"
|
||||
time:
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "すべての通知を既読にしますか？"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -523,6 +523,12 @@ desktop/views/components/users-list-item.vue:
|
||||
desktop/views/components/window.vue:
|
||||
popout: "ポップアウト"
|
||||
close: "閉じる"
|
||||
desktop/views/pages/welcome.vue:
|
||||
signin: "ログイン"
|
||||
signup: "新規登録"
|
||||
signin-button: "やってる"
|
||||
signup-button: "やる"
|
||||
timeline: "タイムライン"
|
||||
desktop/views/pages/drive.vue:
|
||||
title: "Misskey Drive"
|
||||
desktop/views/pages/favorites.vue:
|
||||
@ -676,7 +682,6 @@ mobile/views/pages/notifications.vue:
|
||||
read-all: "すべての通知を既読にしますか？"
|
||||
mobile/views/pages/settings/settings.profile.vue:
|
||||
title: "プロフィール"
|
||||
will-be-published: "※公開されます"
|
||||
name: "名前"
|
||||
account: "アカウント"
|
||||
location: "場所"
|
||||
@ -684,7 +689,6 @@ mobile/views/pages/settings/settings.profile.vue:
|
||||
birthday: "誕生日"
|
||||
avatar: "アイコン"
|
||||
banner: "バナー"
|
||||
is-bot: "このアカウントはBotです"
|
||||
is-cat: "このアカウントはCatです"
|
||||
save: "保存"
|
||||
saved: "プロフィールを保存しました"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"name": "misskey",
|
||||
"author": "syuilo <i@syuilo.com>",
|
||||
"version": "2.14.0",
|
||||
"clientVersion": "1.0.5606",
|
||||
"version": "2.16.0",
|
||||
"clientVersion": "1.0.5650",
|
||||
"codename": "nighthike",
|
||||
"main": "./built/index.js",
|
||||
"private": true,
|
||||
|
||||
@ -40,9 +40,6 @@
|
||||
const data = JSON.parse(vuex);
|
||||
if (data.device.lang) lang = data.device.lang;
|
||||
}
|
||||
|
||||
const storedLang = localStorage.getItem('lang');
|
||||
if (storedLang) lang = storedLang;
|
||||
//#endregion
|
||||
|
||||
// Detect the user agent
|
||||
|
||||
@ -28,7 +28,7 @@ export default Vue.extend({
|
||||
},
|
||||
mounted() {
|
||||
document.title = 'Oops!';
|
||||
document.documentElement.style.background = '#f8f8f8';
|
||||
document.documentElement.style.setProperty('background', '#f8f8f8', 'important');
|
||||
},
|
||||
methods: {
|
||||
reload() {
|
||||
|
||||
@ -4,6 +4,9 @@
|
||||
<div class="main">
|
||||
<header>
|
||||
<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</router-link>
|
||||
<span class="is-admin" v-if="note.user.isAdmin">admin</span>
|
||||
<span class="is-bot" v-if="note.user.isBot">bot</span>
|
||||
<span class="is-cat" v-if="note.user.isCat">cat</span>
|
||||
<span class="username"><mk-acct :user="note.user"/></span>
|
||||
<div class="info">
|
||||
<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
|
||||
@ -68,7 +71,6 @@ root(isDark)
|
||||
align-items baseline
|
||||
margin-bottom 2px
|
||||
white-space nowrap
|
||||
line-height 21px
|
||||
|
||||
> .name
|
||||
display block
|
||||
@ -84,6 +86,20 @@ root(isDark)
|
||||
&:hover
|
||||
text-decoration underline
|
||||
|
||||
> .is-admin
|
||||
> .is-bot
|
||||
> .is-cat
|
||||
margin 0 0.5em 0 0
|
||||
padding 1px 5px
|
||||
font-size 10px
|
||||
color isDark ? #758188 : #aaa
|
||||
border solid 1px isDark ? #57616f : #ddd
|
||||
border-radius 3px
|
||||
|
||||
&.is-admin
|
||||
border-color isDark ? #d42c41 : #f56a7b
|
||||
color isDark ? #d42c41 : #f56a7b
|
||||
|
||||
> .username
|
||||
margin 0 .5em 0 0
|
||||
color isDark ? #606984 : #d1d8da
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
<div class="main">
|
||||
<header>
|
||||
<router-link class="name" :to="p.user | userPage" v-user-preview="p.user.id">{{ p.user | userName }}</router-link>
|
||||
<span class="is-admin" v-if="p.user.isAdmin">admin</span>
|
||||
<span class="is-bot" v-if="p.user.isBot">bot</span>
|
||||
<span class="is-cat" v-if="p.user.isCat">cat</span>
|
||||
<span class="username"><mk-acct :user="p.user"/></span>
|
||||
@ -431,6 +432,7 @@ root(isDark)
|
||||
&:hover
|
||||
text-decoration underline
|
||||
|
||||
> .is-admin
|
||||
> .is-bot
|
||||
> .is-cat
|
||||
margin 0 .5em 0 0
|
||||
@ -440,6 +442,10 @@ root(isDark)
|
||||
border solid 1px isDark ? #57616f : #ddd
|
||||
border-radius 3px
|
||||
|
||||
&.is-admin
|
||||
border-color isDark ? #d42c41 : #f56a7b
|
||||
color isDark ? #d42c41 : #f56a7b
|
||||
|
||||
> .username
|
||||
margin 0 .5em 0 0
|
||||
overflow hidden
|
||||
|
||||
@ -1,23 +1,12 @@
|
||||
<template>
|
||||
<div class="mk-welcome">
|
||||
<main>
|
||||
<div class="top">
|
||||
<div>
|
||||
<div>
|
||||
<h1>Share<br><span ref="share">Everything!</span><span class="cursor">_</span></h1>
|
||||
<p>ようこそ！ <b>Misskey</b>はTwitter風ミニブログSNSです。思ったことや皆と共有したいことを投稿しましょう。タイムラインを見れば、皆の関心事をすぐにチェックすることもできます。<a :href="aboutUrl">詳しく...</a></p>
|
||||
<p><button class="signup" @click="signup">はじめる</button><button class="signin" @click="signin">ログイン</button></p>
|
||||
<div class="users">
|
||||
<mk-avatar class="avatar" v-for="user in users" :key="user.id" :user="user"/>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
<header>%fa:comments R% タイムライン<div><span></span><span></span><span></span></div></header>
|
||||
<mk-welcome-timeline/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<img src="assets/title.svg" alt="Misskey">
|
||||
<p><button class="signup" @click="signup">%i18n:@signup-button%</button><button class="signin" @click="signin">%i18n:@signin-button%</button></p>
|
||||
|
||||
<div class="tl">
|
||||
<header>%fa:comments R% %i18n:@timeline%<div><span></span><span></span><span></span></div></header>
|
||||
<mk-welcome-timeline/>
|
||||
</div>
|
||||
</main>
|
||||
<mk-forkit/>
|
||||
@ -28,11 +17,11 @@
|
||||
</div>
|
||||
</footer>
|
||||
<modal name="signup" width="500px" height="auto" scrollable>
|
||||
<header :class="$style.signupFormHeader">新規登録</header>
|
||||
<header :class="$style.signupFormHeader">%i18n:@signup%</header>
|
||||
<mk-signup :class="$style.signupForm"/>
|
||||
</modal>
|
||||
<modal name="signin" width="500px" height="auto" scrollable>
|
||||
<header :class="$style.signinFormHeader">ログイン</header>
|
||||
<header :class="$style.signinFormHeader">%i18n:@signin%</header>
|
||||
<mk-signin :class="$style.signinForm"/>
|
||||
</modal>
|
||||
</div>
|
||||
@ -42,58 +31,13 @@
|
||||
import Vue from 'vue';
|
||||
import { docsUrl, copyright, lang } from '../../../config';
|
||||
|
||||
const shares = [
|
||||
'Everything!',
|
||||
'Webpages',
|
||||
'Photos',
|
||||
'Interests',
|
||||
'Favorites'
|
||||
];
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
return {
|
||||
aboutUrl: `${docsUrl}/${lang}/about`,
|
||||
copyright,
|
||||
users: [],
|
||||
clock: null,
|
||||
i: 0
|
||||
copyright
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
(this as any).api('users', {
|
||||
sort: '+follower',
|
||||
limit: 20
|
||||
}).then(users => {
|
||||
this.users = users;
|
||||
});
|
||||
|
||||
this.clock = setInterval(() => {
|
||||
if (++this.i == shares.length) this.i = 0;
|
||||
const speed = 70;
|
||||
const text = (this.$refs.share as any).innerText;
|
||||
for (let i = 0; i < text.length; i++) {
|
||||
setTimeout(() => {
|
||||
if (this.$refs.share) {
|
||||
(this.$refs.share as any).innerText = text.substr(0, text.length - i);
|
||||
}
|
||||
}, i * speed)
|
||||
}
|
||||
setTimeout(() => {
|
||||
const newText = shares[this.i];
|
||||
for (let i = 0; i <= newText.length; i++) {
|
||||
setTimeout(() => {
|
||||
if (this.$refs.share) {
|
||||
(this.$refs.share as any).innerText = newText.substr(0, i);
|
||||
}
|
||||
}, i * speed)
|
||||
}
|
||||
}, text.length * speed);
|
||||
}, 4000);
|
||||
},
|
||||
beforeDestroy() {
|
||||
clearInterval(this.clock);
|
||||
},
|
||||
methods: {
|
||||
signup() {
|
||||
this.$modal.show('signup');
|
||||
@ -121,155 +65,95 @@ export default Vue.extend({
|
||||
display flex
|
||||
flex-direction column
|
||||
flex 1
|
||||
$width = 1000px
|
||||
|
||||
background linear-gradient(to bottom, #1e1d65, #bd6659)
|
||||
//background-image url('/assets/welcome-bg.svg')
|
||||
background-size cover
|
||||
background-position top center
|
||||
|
||||
&:before
|
||||
content ""
|
||||
display block
|
||||
position fixed
|
||||
bottom 0
|
||||
left 0
|
||||
width 100%
|
||||
height 100%
|
||||
background-image url('/assets/welcome-fg.svg')
|
||||
background-size cover
|
||||
background-position bottom center
|
||||
|
||||
> main
|
||||
display flex
|
||||
flex 1
|
||||
padding 64px 0 0 0
|
||||
text-align center
|
||||
color #555
|
||||
|
||||
> .top
|
||||
display flex
|
||||
width 100%
|
||||
> img
|
||||
width 350px
|
||||
|
||||
> div
|
||||
display flex
|
||||
max-width $width + 64px
|
||||
margin 0 auto
|
||||
padding 80px 32px 0 32px
|
||||
> p
|
||||
margin 8px 0
|
||||
line-height 2em
|
||||
|
||||
> *
|
||||
margin-bottom 48px
|
||||
button
|
||||
padding 8px 16px
|
||||
font-size inherit
|
||||
|
||||
> div:first-child
|
||||
margin-right 48px
|
||||
color #fff
|
||||
text-shadow 0 0 12px #172062
|
||||
.signup
|
||||
color $theme-color
|
||||
border solid 2px $theme-color
|
||||
border-radius 4px
|
||||
|
||||
> h1
|
||||
margin 0
|
||||
font-weight bold
|
||||
//font-variant small-caps
|
||||
letter-spacing 12px
|
||||
font-family 'Sarpanch', sans-serif
|
||||
font-size 42px
|
||||
line-height 48px
|
||||
&:focus
|
||||
box-shadow 0 0 0 3px rgba($theme-color, 0.2)
|
||||
|
||||
> .cursor
|
||||
animation cursor 1s infinite linear both
|
||||
&:hover
|
||||
color $theme-color-foreground
|
||||
background $theme-color
|
||||
|
||||
@keyframes cursor
|
||||
0%
|
||||
opacity 1
|
||||
50%
|
||||
opacity 0
|
||||
&:active
|
||||
color $theme-color-foreground
|
||||
background darken($theme-color, 10%)
|
||||
border-color darken($theme-color, 10%)
|
||||
|
||||
> p
|
||||
margin 1em 0
|
||||
line-height 2em
|
||||
.signin
|
||||
&:hover
|
||||
color #000
|
||||
|
||||
button
|
||||
padding 8px 16px
|
||||
font-size inherit
|
||||
> .tl
|
||||
margin 32px auto 0 auto
|
||||
width 410px
|
||||
text-align left
|
||||
background #fff
|
||||
border-radius 8px
|
||||
box-shadow 0 8px 32px rgba(#000, 0.15)
|
||||
overflow hidden
|
||||
|
||||
.signup
|
||||
color $theme-color
|
||||
border solid 2px $theme-color
|
||||
border-radius 4px
|
||||
> header
|
||||
z-index 1
|
||||
padding 12px 16px
|
||||
color #888d94
|
||||
box-shadow 0 1px 0px rgba(#000, 0.1)
|
||||
|
||||
&:focus
|
||||
box-shadow 0 0 0 3px rgba($theme-color, 0.2)
|
||||
> div
|
||||
position absolute
|
||||
top 0
|
||||
right 0
|
||||
padding inherit
|
||||
|
||||
&:hover
|
||||
color $theme-color-foreground
|
||||
background $theme-color
|
||||
> span
|
||||
display inline-block
|
||||
height 11px
|
||||
width 11px
|
||||
margin-left 6px
|
||||
background #ccc
|
||||
border-radius 100%
|
||||
vertical-align middle
|
||||
|
||||
&:active
|
||||
color $theme-color-foreground
|
||||
background darken($theme-color, 10%)
|
||||
border-color darken($theme-color, 10%)
|
||||
&:nth-child(1)
|
||||
background #5BCC8B
|
||||
|
||||
.signin
|
||||
&:hover
|
||||
color #fff
|
||||
&:nth-child(2)
|
||||
background #E6BB46
|
||||
|
||||
> .users
|
||||
margin 16px 0 0 0
|
||||
&:nth-child(3)
|
||||
background #DF7065
|
||||
|
||||
> *
|
||||
display inline-block
|
||||
margin 4px
|
||||
width 38px
|
||||
height 38px
|
||||
border-radius 6px
|
||||
|
||||
> div:last-child
|
||||
|
||||
> div
|
||||
width 410px
|
||||
background #fff
|
||||
border-radius 8px
|
||||
box-shadow 0 0 0 12px rgba(#000, 0.1)
|
||||
overflow hidden
|
||||
|
||||
> header
|
||||
z-index 1
|
||||
padding 12px 16px
|
||||
color #888d94
|
||||
box-shadow 0 1px 0px rgba(#000, 0.1)
|
||||
|
||||
> div
|
||||
position absolute
|
||||
top 0
|
||||
right 0
|
||||
padding inherit
|
||||
|
||||
> span
|
||||
display inline-block
|
||||
height 11px
|
||||
width 11px
|
||||
margin-left 6px
|
||||
background #ccc
|
||||
border-radius 100%
|
||||
vertical-align middle
|
||||
|
||||
&:nth-child(1)
|
||||
background #5BCC8B
|
||||
|
||||
&:nth-child(2)
|
||||
background #E6BB46
|
||||
|
||||
&:nth-child(3)
|
||||
background #DF7065
|
||||
|
||||
> .mk-welcome-timeline
|
||||
max-height 350px
|
||||
overflow auto
|
||||
> .mk-welcome-timeline
|
||||
max-height 350px
|
||||
overflow auto
|
||||
|
||||
> footer
|
||||
font-size 12px
|
||||
color #949ea5
|
||||
|
||||
> div
|
||||
max-width $width
|
||||
margin 0 auto
|
||||
padding 0 0 42px 0
|
||||
padding 64px
|
||||
text-align center
|
||||
|
||||
> .c
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
<template>
|
||||
<div class="sub">
|
||||
<mk-avatar class="avatar" :user="note.user"/>
|
||||
<div class="sub" :class="{ smart: $store.state.device.postStyle == 'smart' }">
|
||||
<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/>
|
||||
<div class="main">
|
||||
<header>
|
||||
<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
|
||||
<router-link class="name" :to="note.user | userPage">{{ note.user | userName }}</router-link>
|
||||
<span class="is-admin" v-if="note.user.isAdmin">admin</span>
|
||||
<span class="is-bot" v-if="note.user.isBot">bot</span>
|
||||
<span class="is-cat" v-if="note.user.isCat">cat</span>
|
||||
<span class="username"><mk-acct :user="note.user"/></span>
|
||||
<div class="info">
|
||||
<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
|
||||
@ -42,6 +46,13 @@ root(isDark)
|
||||
@media (min-width 600px)
|
||||
padding 24px 32px
|
||||
|
||||
&.smart
|
||||
> .main
|
||||
width 100%
|
||||
|
||||
> header
|
||||
align-items center
|
||||
|
||||
&:after
|
||||
content ""
|
||||
display block
|
||||
@ -73,6 +84,13 @@ root(isDark)
|
||||
margin-bottom 2px
|
||||
white-space nowrap
|
||||
|
||||
> .avatar
|
||||
flex-shrink 0
|
||||
margin-right 8px
|
||||
width 18px
|
||||
height 18px
|
||||
border-radius 100%
|
||||
|
||||
> .name
|
||||
display block
|
||||
margin 0 0.5em 0 0
|
||||
@ -88,6 +106,20 @@ root(isDark)
|
||||
&:hover
|
||||
text-decoration underline
|
||||
|
||||
> .is-admin
|
||||
> .is-bot
|
||||
> .is-cat
|
||||
margin 0 0.5em 0 0
|
||||
padding 1px 5px
|
||||
font-size 10px
|
||||
color isDark ? #758188 : #aaa
|
||||
border solid 1px isDark ? #57616f : #ddd
|
||||
border-radius 3px
|
||||
|
||||
&.is-admin
|
||||
border-color isDark ? #d42c41 : #f56a7b
|
||||
color isDark ? #d42c41 : #f56a7b
|
||||
|
||||
> .username
|
||||
text-align left
|
||||
margin 0
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
<header>
|
||||
<mk-avatar class="avatar" :user="p.user" v-if="$store.state.device.postStyle == 'smart'"/>
|
||||
<router-link class="name" :to="p.user | userPage">{{ p.user | userName }}</router-link>
|
||||
<span class="is-admin" v-if="p.user.isAdmin">admin</span>
|
||||
<span class="is-bot" v-if="p.user.isBot">bot</span>
|
||||
<span class="is-cat" v-if="p.user.isCat">cat</span>
|
||||
<span class="username"><mk-acct :user="p.user"/></span>
|
||||
@ -289,6 +290,7 @@ root(isDark)
|
||||
padding 16px 32px
|
||||
|
||||
.avatar
|
||||
flex-shrink 0
|
||||
display inline-block
|
||||
width 20px
|
||||
height 20px
|
||||
@ -387,6 +389,7 @@ root(isDark)
|
||||
&:hover
|
||||
text-decoration underline
|
||||
|
||||
> .is-admin
|
||||
> .is-bot
|
||||
> .is-cat
|
||||
margin 0 0.5em 0 0
|
||||
@ -396,6 +399,10 @@ root(isDark)
|
||||
border solid 1px isDark ? #57616f : #ddd
|
||||
border-radius 3px
|
||||
|
||||
&.is-admin
|
||||
border-color isDark ? #d42c41 : #f56a7b
|
||||
color isDark ? #d42c41 : #f56a7b
|
||||
|
||||
> .username
|
||||
margin 0 0.5em 0 0
|
||||
overflow hidden
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
<md-icon>%fa:birthday-cake%</md-icon>
|
||||
<label>%i18n:@birthday%</label>
|
||||
<md-input type="date" v-model="birthday" :disabled="saving"/>
|
||||
<span class="md-helper-text">%i18n:@will-be-published%</span>
|
||||
</md-field>
|
||||
|
||||
<md-field>
|
||||
@ -49,10 +48,6 @@
|
||||
:md-active.sync="uploading"
|
||||
md-content="%18n:!@uploading%"/>
|
||||
|
||||
<div>
|
||||
<md-switch v-model="isBot">%i18n:@is-bot%</md-switch>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<md-switch v-model="isCat">%i18n:@is-cat%</md-switch>
|
||||
</div>
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
|
||||
y="0px" width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
|
||||
<circle fill="#2B2F2D" cx="128" cy="153.6" r="19.201"/>
|
||||
<circle fill="#2B2F2D" cx="51.2" cy="153.6" r="19.2"/>
|
||||
<circle fill="#2B2F2D" cx="204.8" cy="153.6" r="19.2"/>
|
||||
<polyline fill="none" stroke="#2B2F2D" stroke-width="16" stroke-linejoin="round" stroke-miterlimit="10" points="51.2,153.6
|
||||
89.601,102.4 128,153.6 166.4,102.4 204.799,153.6 "/>
|
||||
<circle fill="#2B2F2D" cx="89.6" cy="102.4" r="19.2"/>
|
||||
<circle fill="#2B2F2D" cx="166.4" cy="102.4" r="19.199"/>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1021 B |
@ -10,11 +10,6 @@
|
||||
localStorage.setItem('v', v);
|
||||
}
|
||||
|
||||
const lang = window.prompt('Enter language (optional):');
|
||||
if (lang && lang.length > 0) {
|
||||
localStorage.setItem('lang', lang);
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
location.href = '/';
|
||||
}, 500);
|
||||
|
||||
Reference in New Issue
Block a user