summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-01-30 04:37:25 +0900
committerGitHub <noreply@github.com>2020-01-30 04:37:25 +0900
commitf6154dc0af1a0d65819e87240f4385f9573095cb (patch)
tree699a5ca07d6727b7f8497d4769f25d6d62f94b5a /src/server/web
parentAdd Event activity-type support (#5785) (diff)
downloadsharkey-f6154dc0af1a0d65819e87240f4385f9573095cb.tar.gz
sharkey-f6154dc0af1a0d65819e87240f4385f9573095cb.tar.bz2
sharkey-f6154dc0af1a0d65819e87240f4385f9573095cb.zip
v12 (#5712)
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com> Co-authored-by: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/docs.ts3
-rw-r--r--src/server/web/index.ts1
-rw-r--r--src/server/web/views/base.pug25
3 files changed, 20 insertions, 9 deletions
diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts
index 558e811466..c6c5fd1e2f 100644
--- a/src/server/web/docs.ts
+++ b/src/server/web/docs.ts
@@ -12,7 +12,6 @@ import * as send from 'koa-send';
import * as glob from 'glob';
import config from '../../config';
import { licenseHtml } from '../../misc/license';
-import { copyright } from '../../const.json';
import * as locales from '../../../locales';
import * as nestedProperty from 'nested-property';
@@ -48,7 +47,7 @@ async function genVars(lang: string): Promise<{ [key: string]: any }> {
vars['config'] = config;
- vars['copyright'] = copyright;
+ vars['copyright'] = '(c) Misskey';
vars['license'] = licenseHtml;
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 06c7274f5a..57bcb855a1 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -31,6 +31,7 @@ const app = new Koa();
app.use(views(__dirname + '/views', {
extension: 'pug',
options: {
+ version: config.version,
config
}
}));
diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug
index 97c7a87e1b..43b82a5f05 100644
--- a/src/server/web/views/base.pug
+++ b/src/server/web/views/base.pug
@@ -10,7 +10,7 @@ html
meta(charset='utf-8')
meta(name='application-name' content='Misskey')
meta(name='referrer' content='origin')
- meta(name='theme-color' content='#105779')
+ meta(name='theme-color' content='#86b300')
meta(property='og:site_name' content= instanceName || 'Misskey')
meta(name='viewport' content='width=device-width, initial-scale=1')
link(rel='icon' href= icon || '/favicon.ico')
@@ -30,12 +30,23 @@ html
meta(property='og:image' content=img)
style
- include ./../../../../built/client/assets/init.css
- script
- include ./../../../../built/client/assets/boot.js
-
- script
- include ./../../../../built/client/assets/safe.js
+ include ./../../../../built/client/assets/style.css
+ script(src=`/assets/app.${version}.js` async defer)
+ script.
+ const theme = localStorage.getItem('theme');
+ if (theme) {
+ for (const [k, v] of Object.entries(JSON.parse(theme))) {
+ document.documentElement.style.setProperty(`--${k}`, v.toString());
+ if (k === 'accent') {
+ for (const tag of document.head.children) {
+ if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') {
+ tag.setAttribute('content', v);
+ break;
+ }
+ }
+ }
+ }
+ }
body
noscript: p