diff --git a/CHANGELOG.md b/CHANGELOG.md index 66039a227a..faefb4d72f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ unreleased * New: ドナーを表示する (#738) * Fix: 投稿のリンクが機能していない問題を修正 * l10n +* デザインの調整 2470 (2017/08/29) ----------------- diff --git a/locales/en.yml b/locales/en.yml index 782630ef42..b0488a775c 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -376,6 +376,7 @@ mobile: title: "Profile Settings" mk-profile-setting: + will-be-published: "These profiles will be published." name: "Name" location: "Location" description: "Description" diff --git a/locales/ja.yml b/locales/ja.yml index 7b1f052f91..9a040f798d 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -376,6 +376,7 @@ mobile: title: "プロフィール設定" mk-profile-setting: + will-be-published: "これらのプロフィールは公開されます。" name: "名前" location: "場所" description: "自己紹介" diff --git a/src/web/app/mobile/tags/page/settings.tag b/src/web/app/mobile/tags/page/settings.tag index 710591071d..b129b97bd1 100644 --- a/src/web/app/mobile/tags/page/settings.tag +++ b/src/web/app/mobile/tags/page/settings.tag @@ -12,7 +12,7 @@ this.on('mount', () => { document.title = 'Misskey | %i18n:mobile.tags.mk-settings-page.settings%'; ui.trigger('title', '%i18n:mobile.tags.mk-settings-page.settings%'); - document.documentElement.style.background = '#eee'; + document.documentElement.style.background = '#313a42'; }); @@ -37,19 +37,36 @@ display block margin 24px text-align center - color #555 + color #cad2da > ul + $radius = 8px + display block - margin 16px 0 + margin 16px auto padding 0 + max-width 500px + width calc(100% - 32px) list-style none - border-top solid 1px #aaa + background #fff + border solid 1px rgba(0, 0, 0, 0.2) + border-radius $radius > li display block - background #fff - border-bottom solid 1px #aaa + border-bottom solid 1px #ddd + + &:hover + background rgba(0, 0, 0, 0.1) + + &:first-child + border-top-left-radius $radius + border-top-right-radius $radius + + &:last-child + border-bottom-left-radius $radius + border-bottom-right-radius $radius + border-bottom none > a $height = 48px diff --git a/src/web/app/mobile/tags/page/settings/profile.tag b/src/web/app/mobile/tags/page/settings/profile.tag index de365c235e..fb78d2f719 100644 --- a/src/web/app/mobile/tags/page/settings/profile.tag +++ b/src/web/app/mobile/tags/page/settings/profile.tag @@ -12,80 +12,135 @@ this.on('mount', () => { document.title = 'Misskey | %i18n:mobile.tags.mk-profile-setting-page.title%'; ui.trigger('title', '%i18n:mobile.tags.mk-profile-setting-page.title%'); - document.documentElement.style.background = '#eee'; + document.documentElement.style.background = '#313a42'; }); - - %i18n:mobile.tags.mk-profile-setting.name% - - - - %i18n:mobile.tags.mk-profile-setting.location% - - - - %i18n:mobile.tags.mk-profile-setting.description% - { I.description } - - - %i18n:mobile.tags.mk-profile-setting.birthday% - - - - %i18n:mobile.tags.mk-profile-setting.avatar% - %i18n:mobile.tags.mk-profile-setting.set-avatar% - - - %i18n:mobile.tags.mk-profile-setting.banner% - %i18n:mobile.tags.mk-profile-setting.set-banner% - - %i18n:mobile.tags.mk-profile-setting.save% + + %i18n:mobile.tags.mk-profile-setting.will-be-published% + + + %i18n:mobile.tags.mk-profile-setting.name% + + + + %i18n:mobile.tags.mk-profile-setting.location% + + + + %i18n:mobile.tags.mk-profile-setting.description% + { I.description } + + + %i18n:mobile.tags.mk-profile-setting.birthday% + + + + %i18n:mobile.tags.mk-profile-setting.avatar% + %i18n:mobile.tags.mk-profile-setting.set-avatar% + + + %i18n:mobile.tags.mk-profile-setting.banner% + %i18n:mobile.tags.mk-profile-setting.set-banner% + + + %i18n:mobile.tags.mk-profile-setting.save% +
%i18n:mobile.tags.mk-profile-setting.name%
%i18n:mobile.tags.mk-profile-setting.location%
%i18n:mobile.tags.mk-profile-setting.description%
%i18n:mobile.tags.mk-profile-setting.birthday%
%i18n:mobile.tags.mk-profile-setting.avatar%
%i18n:mobile.tags.mk-profile-setting.banner%
%i18n:mobile.tags.mk-profile-setting.will-be-published%