diff options
| author | syuilo⭐️ <Syuilotan@yahoo.co.jp> | 2017-02-09 01:03:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 01:03:20 +0900 |
| commit | 5b969c8407735120e94596facae84e4a373a9103 (patch) | |
| tree | 7a2aaccef0876a389e362f6a3d9d3cecf9ebf1a4 /src/web | |
| parent | Refactor: Remove the unused import (diff) | |
| parent | Update settings-window.tag (diff) | |
| download | misskey-5b969c8407735120e94596facae84e4a373a9103.tar.gz misskey-5b969c8407735120e94596facae84e4a373a9103.tar.bz2 misskey-5b969c8407735120e94596facae84e4a373a9103.zip | |
Merge pull request #134 from tamaina/master
設定画面の見栄えをましにする
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/app/desktop/tags/settings-window.tag | 2 | ||||
| -rw-r--r-- | src/web/app/desktop/tags/settings.tag | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/web/app/desktop/tags/settings-window.tag b/src/web/app/desktop/tags/settings-window.tag index e39d79bcb1..579f6ac992 100644 --- a/src/web/app/desktop/tags/settings-window.tag +++ b/src/web/app/desktop/tags/settings-window.tag @@ -11,7 +11,7 @@ margin-right 4px [data-yield='content'] - overflow auto + overflow hidden </style> <script> diff --git a/src/web/app/desktop/tags/settings.tag b/src/web/app/desktop/tags/settings.tag index 3f8f759b47..29ef3cba53 100644 --- a/src/web/app/desktop/tags/settings.tag +++ b/src/web/app/desktop/tags/settings.tag @@ -85,7 +85,9 @@ </div> <style type="stylus"> :scope - display block + display flex + width 100% + height 100% input:not([type]) input[type='text'] @@ -106,13 +108,11 @@ border-color #aeaeae > .nav - position absolute - top 0 - left 0 - width 200px + width 100% height 100% padding 16px 0 0 0 border-right solid 1px #ddd + flex: 0 0 200px > p display block @@ -139,10 +139,10 @@ color $theme-color !important > .pages - position absolute - top 0 - left 200px - width calc(100% - 200px) + width 100% + height 100% + flex auto + overflow auto > section padding 32px |