diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-02-23 01:27:02 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-02-23 01:27:02 +0900 |
| commit | e0ffedca240309bada9dcd7e53e66cc804e2912d (patch) | |
| tree | 6ebef737b1fac96f03dde8c83c4f8862f52eb331 /src | |
| parent | wip (diff) | |
| download | sharkey-e0ffedca240309bada9dcd7e53e66cc804e2912d.tar.gz sharkey-e0ffedca240309bada9dcd7e53e66cc804e2912d.tar.bz2 sharkey-e0ffedca240309bada9dcd7e53e66cc804e2912d.zip | |
wip
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/private/signup.ts | 6 | ||||
| -rw-r--r-- | src/web/app/desktop/views/components/dialog.vue | 29 | ||||
| -rw-r--r-- | src/web/app/desktop/views/components/post-preview.vue | 1 |
3 files changed, 19 insertions, 17 deletions
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts index 8efdb6db47..19e3314756 100644 --- a/src/api/private/signup.ts +++ b/src/api/private/signup.ts @@ -15,7 +15,7 @@ const home = { 'profile', 'calendar', 'activity', - 'rss-reader', + 'rss', 'trends', 'photo-stream', 'version' @@ -23,8 +23,8 @@ const home = { right: [ 'broadcast', 'notifications', - 'user-recommendation', - 'recommended-polls', + 'users', + 'polls', 'server', 'donation', 'nav', diff --git a/src/web/app/desktop/views/components/dialog.vue b/src/web/app/desktop/views/components/dialog.vue index f089b19a4e..28f22f7b62 100644 --- a/src/web/app/desktop/views/components/dialog.vue +++ b/src/web/app/desktop/views/components/dialog.vue @@ -2,7 +2,7 @@ <div class="mk-dialog"> <div class="bg" ref="bg" @click="onBgClick"></div> <div class="main" ref="main"> - <header v-html="title"></header> + <header v-html="title" :class="$style.header"></header> <div class="body" v-html="text"></div> <div class="buttons"> <button v-for="button in buttons" @click="click(button)">{{ button.text }}</button> @@ -110,18 +110,6 @@ export default Vue.extend({ background #fff opacity 0 - > header - margin 1em 0 - color $theme-color - // color #43A4EC - font-weight bold - - &:empty - display none - - > i - margin-right 0.5em - > .body margin 1em 0 color #888 @@ -154,3 +142,18 @@ export default Vue.extend({ transition color 0s ease </style> + +<style lang="stylus" module> +.header + margin 1em 0 + color $theme-color + // color #43A4EC + font-weight bold + + &:empty + display none + + > i + margin-right 0.5em + +</style> diff --git a/src/web/app/desktop/views/components/post-preview.vue b/src/web/app/desktop/views/components/post-preview.vue index b39ad3db40..6a0a60e4af 100644 --- a/src/web/app/desktop/views/components/post-preview.vue +++ b/src/web/app/desktop/views/components/post-preview.vue @@ -64,7 +64,6 @@ export default Vue.extend({ > header display flex - margin 4px 0 white-space nowrap > .name |