diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-06-07 05:14:37 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-06-07 05:14:37 +0900 |
| commit | 14d12c21f2ee7f7162b3583e94c13b8a6e7f1e43 (patch) | |
| tree | fbec3e2594e98416463f3a270f61ec15eb07c9a8 /src/client | |
| parent | Fix (diff) | |
| download | misskey-14d12c21f2ee7f7162b3583e94c13b8a6e7f1e43.tar.gz misskey-14d12c21f2ee7f7162b3583e94c13b8a6e7f1e43.tar.bz2 misskey-14d12c21f2ee7f7162b3583e94c13b8a6e7f1e43.zip | |
nanka iroiro
Diffstat (limited to 'src/client')
4 files changed, 31 insertions, 2 deletions
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index 1bfff8cc83..e0d578c33b 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -40,6 +40,7 @@ <button class="ui button" @click="customizeHome" style="margin-bottom: 16px">%i18n:@customize%</button> </div> <div class="div"> + <button class="ui" @click="updateWallpaper">%i18n:@choose-wallpaper%</button> <mk-switch v-model="darkmode" text="%i18n:@dark-mode%"/> <mk-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons" text="%i18n:@circle-icons%"/> <mk-switch v-model="$store.state.settings.gradientWindowHeader" @change="onChangeGradientWindowHeader" text="%i18n:@gradient-window-header%"/> @@ -293,6 +294,15 @@ export default Vue.extend({ this.$router.push('/i/customize-home'); this.$emit('done'); }, + updateWallpaper() { + (this as any).apis.chooseDriveFile({ + multiple: false + }).then(file => { + (this as any).api('i/update', { + wallpaperId: file.id + }); + }); + }, onChangeFetchOnScroll(v) { this.$store.dispatch('settings/set', { key: 'fetchOnScroll', diff --git a/src/client/app/desktop/views/components/ui.vue b/src/client/app/desktop/views/components/ui.vue index 34769b52bb..351deafded 100644 --- a/src/client/app/desktop/views/components/ui.vue +++ b/src/client/app/desktop/views/components/ui.vue @@ -1,5 +1,5 @@ <template> -<div class="mk-ui"> +<div class="mk-ui" :style="style"> <x-header class="header"/> <div class="content"> <slot></slot> @@ -16,6 +16,15 @@ export default Vue.extend({ components: { XHeader }, + computed: { + style(): any { + if (!this.$store.getters.isSignedIn || this.$store.state.i.wallpaperUrl == null) return {}; + return { + backgroundColor: this.$store.state.i.wallpaperColor && this.$store.state.i.wallpaperColor.length == 3 ? `rgb(${ this.$store.state.i.wallpaperColor.join(',') })` : null, + backgroundImage: `url(${ this.$store.state.i.wallpaperUrl })` + }; + } + }, mounted() { document.addEventListener('keydown', this.onKeydown); }, @@ -40,6 +49,9 @@ export default Vue.extend({ display flex flex-direction column flex 1 + background-size cover + background-position center + background-attachment fixed > .header @media (max-width 1000px) diff --git a/src/client/app/desktop/views/pages/deck/deck.column.vue b/src/client/app/desktop/views/pages/deck/deck.column.vue index 458732fa73..f71503d5c1 100644 --- a/src/client/app/desktop/views/pages/deck/deck.column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.column.vue @@ -140,6 +140,7 @@ root(isDark) z-index 1 line-height $header-height padding 0 16px + font-size 14px color isDark ? #e3e5e8 : #888 background isDark ? #313543 : #fff box-shadow 0 1px rgba(#000, 0.15) diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index d6cbf7396d..369874ec67 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -150,7 +150,6 @@ export default Vue.extend({ root(isDark) display flex flex 1 - justify-content center padding 16px 0 16px 16px overflow auto @@ -160,6 +159,13 @@ root(isDark) &:last-of-type margin-right 0 + > * + &:first-child + margin-left auto + + &:last-child + margin-right auto + > button padding 0 16px color isDark ? #93a0a5 : #888 |