DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
syuilo 2020-03-22 19:47:30 +09:00
parent 4eb05efa7c 9f49c663f8
commit ecf44084dc
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/icon.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

2
package.json
View File

@ -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",

5
src/client/app.vue
View File

@ -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();

2
src/client/init.ts
View File

@ -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 });
} }

3
src/client/pages/pages.vue
View File

@ -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">