Merge branch 'develop'
This commit is contained in:
commit
ecf44084dc
5 changed files with 9 additions and 3 deletions
BIN
assets/icon.svg
Normal file
BIN
assets/icon.svg
Normal file
Binary file not shown.
After Width: | Height: | Size: 3 KiB |
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
||||||
"version": "12.24.0",
|
"version": "12.24.1",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -246,7 +246,10 @@ export default Vue.extend({
|
||||||
if (this.isDesktop) this.adjustWidgetsWidth();
|
if (this.isDesktop) this.adjustWidgetsWidth();
|
||||||
|
|
||||||
const adjustTitlePosition = () => {
|
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();
|
adjustTitlePosition();
|
||||||
|
|
|
@ -144,7 +144,7 @@ os.init(async () => {
|
||||||
}
|
}
|
||||||
}, false)
|
}, false)
|
||||||
|
|
||||||
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', mql => {
|
window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
|
||||||
if (os.store.state.device.syncDeviceDarkMode) {
|
if (os.store.state.device.syncDeviceDarkMode) {
|
||||||
os.store.commit('device/set', { key: 'darkMode', value: mql.matches });
|
os.store.commit('device/set', { key: 'darkMode', value: mql.matches });
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
|
<portal to="icon"><fa :icon="faStickyNote"/></portal>
|
||||||
|
<portal to="title">{{ $t('pages') }}</portal>
|
||||||
|
|
||||||
<mk-container :body-togglable="true">
|
<mk-container :body-togglable="true">
|
||||||
<template #header><fa :icon="faEdit" fixed-width/>{{ $t('_pages.my') }}</template>
|
<template #header><fa :icon="faEdit" fixed-width/>{{ $t('_pages.my') }}</template>
|
||||||
<div class="rknalgpo my">
|
<div class="rknalgpo my">
|
||||||
|
|
Loading…
Reference in a new issue