summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-04 14:10:14 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-04 14:10:14 +0900
commit073a2def64c7f45062b30a73c433a29988f0e05e (patch)
tree3b9f1e2b07ef4bd7e5cb6fab49dd92183bb7db3a /src/web
parent:v: (diff)
downloadmisskey-073a2def64c7f45062b30a73c433a29988f0e05e.tar.gz
misskey-073a2def64c7f45062b30a73c433a29988f0e05e.tar.bz2
misskey-073a2def64c7f45062b30a73c433a29988f0e05e.zip
#1177
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/desktop/ui.styl3
-rw-r--r--src/web/app/desktop/views/components/settings.vue17
2 files changed, 18 insertions, 2 deletions
diff --git a/src/web/app/desktop/ui.styl b/src/web/app/desktop/ui.styl
index 058271876b..5a8d1718e2 100644
--- a/src/web/app/desktop/ui.styl
+++ b/src/web/app/desktop/ui.styl
@@ -22,6 +22,9 @@ button.ui
border-radius 4px
outline none
+ &.block
+ display block
+
&:focus
&:after
content ""
diff --git a/src/web/app/desktop/views/components/settings.vue b/src/web/app/desktop/views/components/settings.vue
index 20d7a77715..cba14f5f95 100644
--- a/src/web/app/desktop/views/components/settings.vue
+++ b/src/web/app/desktop/views/components/settings.vue
@@ -28,7 +28,7 @@
<section class="web" v-show="page == 'web'">
<h1>モバイル</h1>
- <mk-switch v-model="os.i.client_settings.disableViaMobile" @change="onChangeDisableViaMobile" text="モバイルからの投稿とフラグを付けない"/>
+ <mk-switch v-model="os.i.client_settings.disableViaMobile" @change="onChangeDisableViaMobile" text="「モバイルからの投稿」フラグを付けない"/>
</section>
<section class="web" v-show="page == 'web'">
@@ -109,10 +109,16 @@
<span>最新のバージョン: <i>{{ latestVersion ? latestVersion : version }}</i></span>
</template>
</p>
- <button class="ui button" @click="checkForUpdate" :disabled="checkingForUpdate">
+ <button class="ui button block" @click="checkForUpdate" :disabled="checkingForUpdate">
<template v-if="checkingForUpdate">アップデートを確認中<mk-ellipsis/></template>
<template v-else>アップデートを確認</template>
</button>
+ <details>
+ <summary>詳細設定</summary>
+ <mk-switch v-model="preventUpdate" text="アップデートを延期する(非推奨)">
+ <span>この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。</span>
+ </mk-switch>
+ </details>
</section>
<section class="other" v-show="page == 'other'">
@@ -161,6 +167,7 @@ export default Vue.extend({
latestVersion: undefined,
checkingForUpdate: false,
lang: localStorage.getItem('lang') || '',
+ preventUpdate: localStorage.getItem('preventUpdate') == 'true',
debug: localStorage.getItem('debug') == 'true',
enableExperimental: localStorage.getItem('enableExperimental') == 'true'
};
@@ -169,6 +176,9 @@ export default Vue.extend({
lang() {
localStorage.setItem('lang', this.lang);
},
+ preventUpdate() {
+ localStorage.setItem('preventUpdate', this.preventUpdate ? 'true' : 'false');
+ },
debug() {
localStorage.setItem('debug', this.debug ? 'true' : 'false');
},
@@ -285,6 +295,9 @@ export default Vue.extend({
border-bottom solid 1px #eee
&, >>> *
+ .ui.button.block
+ margin 16px 0
+
> section
margin 32px 0