diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-22 19:47:30 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-22 19:47:30 +0900 |
| commit | ecf44084dc5b679361f78c3e1df0d5c20b884308 (patch) | |
| tree | 2fc0e9414003b4c5ff8e0e1ba19fd58b50d50345 /src/client | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.24.1 (diff) | |
| download | misskey-ecf44084dc5b679361f78c3e1df0d5c20b884308.tar.gz misskey-ecf44084dc5b679361f78c3e1df0d5c20b884308.tar.bz2 misskey-ecf44084dc5b679361f78c3e1df0d5c20b884308.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app.vue | 5 | ||||
| -rw-r--r-- | src/client/init.ts | 2 | ||||
| -rw-r--r-- | src/client/pages/pages.vue | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/client/app.vue b/src/client/app.vue index b47c092ed2..650ebbd2b4 100644 --- a/src/client/app.vue +++ b/src/client/app.vue @@ -246,7 +246,10 @@ export default Vue.extend({ if (this.isDesktop) this.adjustWidgetsWidth(); const adjustTitlePosition = () => { - this.$refs.title.style.left = (this.$refs.main.getBoundingClientRect().left - this.$refs.nav.offsetWidth) + 'px'; + const left = this.$refs.main.getBoundingClientRect().left - this.$refs.nav.offsetWidth; + if (left >= 0) { + this.$refs.title.style.left = left + 'px'; + } }; adjustTitlePosition(); diff --git a/src/client/init.ts b/src/client/init.ts index d7b693e4c8..aed7ff85e8 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -144,7 +144,7 @@ os.init(async () => { } }, false) - window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', mql => { + window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => { if (os.store.state.device.syncDeviceDarkMode) { os.store.commit('device/set', { key: 'darkMode', value: mql.matches }); } diff --git a/src/client/pages/pages.vue b/src/client/pages/pages.vue index d993d0196e..dd3d09db08 100644 --- a/src/client/pages/pages.vue +++ b/src/client/pages/pages.vue @@ -1,5 +1,8 @@ <template> <div> + <portal to="icon"><fa :icon="faStickyNote"/></portal> + <portal to="title">{{ $t('pages') }}</portal> + <mk-container :body-togglable="true"> <template #header><fa :icon="faEdit" fixed-width/>{{ $t('_pages.my') }}</template> <div class="rknalgpo my"> |