summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-11-08 16:50:33 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-11-08 16:50:33 +0900
commite78989c3d4d86e0dc809e3d454919a441acff9e4 (patch)
tree5c0e4c927ec3d7e04fa1b844c57dc00388fbe303
parent:v: (diff)
downloadmisskey-e78989c3d4d86e0dc809e3d454919a441acff9e4.tar.gz
misskey-e78989c3d4d86e0dc809e3d454919a441acff9e4.tar.bz2
misskey-e78989c3d4d86e0dc809e3d454919a441acff9e4.zip
:v: :art: :v:
-rw-r--r--locales/en.yml6
-rw-r--r--locales/ja.yml6
-rw-r--r--src/const.json2
-rw-r--r--src/web/app/desktop/router.js1
-rw-r--r--src/web/app/desktop/style.styl6
-rw-r--r--src/web/app/desktop/tags/pages/entrance/signin.tag2
-rw-r--r--src/web/app/desktop/tags/ui.tag9
-rw-r--r--src/web/app/desktop/tags/user.tag1
8 files changed, 19 insertions, 14 deletions
diff --git a/locales/en.yml b/locales/en.yml
index db86f6f9a6..15e301d3ae 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -267,6 +267,12 @@ desktop:
settings: "Settings"
signout: "Sign out"
+ mk-ui-header-post-button:
+ post: "Compose new Post"
+
+ mk-ui-header-notifications:
+ title: "Notifications"
+
mk-password-setting:
reset: "Change your password"
enter-current-password: "Enter the current password"
diff --git a/locales/ja.yml b/locales/ja.yml
index f8e2eae597..eeb04fe9c9 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -267,6 +267,12 @@ desktop:
settings: "設定"
signout: "サインアウト"
+ mk-ui-header-post-button:
+ post: "新規投稿"
+
+ mk-ui-header-notifications:
+ title: "通知"
+
mk-password-setting:
reset: "パスワードを変更する"
enter-current-password: "現在のパスワードを入力してください"
diff --git a/src/const.json b/src/const.json
index eeb304c9f3..924b4dd8b3 100644
--- a/src/const.json
+++ b/src/const.json
@@ -1,4 +1,4 @@
{
- "themeColor": "#f43636",
+ "themeColor": "#ff4e45",
"themeColorForeground": "#fff"
}
diff --git a/src/web/app/desktop/router.js b/src/web/app/desktop/router.js
index 977e3fa9a6..0fe44a5785 100644
--- a/src/web/app/desktop/router.js
+++ b/src/web/app/desktop/router.js
@@ -72,7 +72,6 @@ export default me => {
};
function mount(content) {
- document.documentElement.style.background = '#313a42';
document.documentElement.removeAttribute('data-page');
if (page) page.unmount();
const body = document.getElementById('app');
diff --git a/src/web/app/desktop/style.styl b/src/web/app/desktop/style.styl
index 4597dffdb3..d99e5df2b4 100644
--- a/src/web/app/desktop/style.styl
+++ b/src/web/app/desktop/style.styl
@@ -40,8 +40,7 @@
background rgba(0, 0, 0, 0.2)
html
- //background #2f3e42
- background #313a42
+ background #f7f7f7
// ↓ workaround of https://github.com/riot/riot/issues/2134
&[data-page='entrance']
@@ -49,9 +48,6 @@ html
right auto
left 15px
-html[theme='dark']
- background #100f0f
-
button
font-family sans-serif
diff --git a/src/web/app/desktop/tags/pages/entrance/signin.tag b/src/web/app/desktop/tags/pages/entrance/signin.tag
index 6caa747c1c..0b33412496 100644
--- a/src/web/app/desktop/tags/pages/entrance/signin.tag
+++ b/src/web/app/desktop/tags/pages/entrance/signin.tag
@@ -95,7 +95,7 @@
z-index 1
padding 0 8px
color rgba(0, 0, 0, 0.5)
- background #fdfdfd
+ background #f7f7f7
> .signup
width 100%
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 3123c34f4f..892c7c6019 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -75,8 +75,7 @@
width 100%
height 48px
backdrop-filter blur(12px)
- //background-color rgba(255, 255, 255, 0.75)
- background #1d2429
+ background #f7f7f7
&:after
content ""
@@ -167,7 +166,7 @@
</mk-ui-header-search>
<mk-ui-header-post-button>
- <button onclick={ post } title="新規投稿"><i class="fa fa-pencil-square-o"></i></button>
+ <button onclick={ post } title="%i18n:desktop.tags.mk-ui-header-post-button.post%"><i class="fa fa-pencil"></i></button>
<style>
:scope
display inline-block
@@ -187,7 +186,7 @@
background $theme-color !important
outline none
border none
- border-radius 2px
+ border-radius 4px
transition background 0.1s ease
cursor pointer
@@ -210,7 +209,7 @@
</mk-ui-header-post-button>
<mk-ui-header-notifications>
- <button class="header" data-active={ isOpen } onclick={ toggle }><i class="fa fa-bell-o"></i></button>
+ <button class="header" data-active={ isOpen } onclick={ toggle } title="%i18n:desktop.tags.mk-ui-header-notifications.title%"><i class="fa fa-bell-o"></i></button>
<div class="notifications" if={ isOpen }>
<mk-notifications/>
</div>
diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag
index db4fd7cc73..2e69872b78 100644
--- a/src/web/app/desktop/tags/user.tag
+++ b/src/web/app/desktop/tags/user.tag
@@ -11,7 +11,6 @@
<style>
:scope
display block
- background #fff
> .user
> header