summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-12-17 04:31:24 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-12-17 04:31:24 +0900
commit74f3a6aadbb01b7032d40b82cf725ec706b103a3 (patch)
tree45fb9473a85300d1c8788a1500722d54334d16c5 /src/web
parent:v: (diff)
downloadsharkey-74f3a6aadbb01b7032d40b82cf725ec706b103a3.tar.gz
sharkey-74f3a6aadbb01b7032d40b82cf725ec706b103a3.tar.bz2
sharkey-74f3a6aadbb01b7032d40b82cf725ec706b103a3.zip
:v:
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/common/tags/copyright.tag7
-rw-r--r--src/web/app/common/tags/index.ts1
-rw-r--r--src/web/app/desktop/tags/pages/entrance.tag4
-rw-r--r--src/web/app/mobile/tags/page/entrance.tag4
-rw-r--r--src/web/docs/layout.pug1
-rw-r--r--src/web/docs/style.styl2
-rw-r--r--src/web/docs/vars.ts3
7 files changed, 9 insertions, 13 deletions
diff --git a/src/web/app/common/tags/copyright.tag b/src/web/app/common/tags/copyright.tag
deleted file mode 100644
index 9c3f1f648b..0000000000
--- a/src/web/app/common/tags/copyright.tag
+++ /dev/null
@@ -1,7 +0,0 @@
-<mk-copyright>
- <span>(c) syuilo 2014-2017</span>
- <style>
- :scope
- display block
- </style>
-</mk-copyright>
diff --git a/src/web/app/common/tags/index.ts b/src/web/app/common/tags/index.ts
index 2f4e1181d4..df99d93cc5 100644
--- a/src/web/app/common/tags/index.ts
+++ b/src/web/app/common/tags/index.ts
@@ -12,7 +12,6 @@ require('./signin.tag');
require('./signup.tag');
require('./forkit.tag');
require('./introduction.tag');
-require('./copyright.tag');
require('./signin-history.tag');
require('./twitter-setting.tag');
require('./authorized-apps.tag');
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index b07b22c80c..974f49a4fe 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -18,7 +18,7 @@
<footer>
<div>
<mk-nav-links/>
- <mk-copyright/>
+ <p class="c">{ _COPYRIGHT_ }</p>
</div>
</footer>
<!-- ↓ https://github.com/riot/riot/issues/2134 (将来的)-->
@@ -101,7 +101,7 @@
text-align center
border-top solid 1px #fff
- > mk-copyright
+ > .c
margin 0
line-height 64px
font-size 10px
diff --git a/src/web/app/mobile/tags/page/entrance.tag b/src/web/app/mobile/tags/page/entrance.tag
index 380fb780bc..191874caf9 100644
--- a/src/web/app/mobile/tags/page/entrance.tag
+++ b/src/web/app/mobile/tags/page/entrance.tag
@@ -8,7 +8,7 @@
</div>
</main>
<footer>
- <mk-copyright/>
+ <p class="c">{ _COPYRIGHT_ }</p>
</footer>
<style>
:scope
@@ -34,7 +34,7 @@
margin 16px auto 0 auto
> footer
- > mk-copyright
+ > .c
margin 0
text-align center
line-height 64px
diff --git a/src/web/docs/layout.pug b/src/web/docs/layout.pug
index 22d89375af..ee8018ec63 100644
--- a/src/web/docs/layout.pug
+++ b/src/web/docs/layout.pug
@@ -35,3 +35,4 @@ html(lang= lang)
p
= common.i18n[lang]['docs']['edit-this-page-on-github']
a(href=src target="_blank")= common.i18n[lang]['docs']['edit-this-page-on-github-link']
+ small= common.copyright
diff --git a/src/web/docs/style.styl b/src/web/docs/style.styl
index 285b92bdb8..32a2264f15 100644
--- a/src/web/docs/style.styl
+++ b/src/web/docs/style.styl
@@ -41,7 +41,7 @@ main
margin 32px 0 0 0
border-top solid 2px #eee
- .copyright
+ > small
margin 16px 0 0 0
color #aaa
diff --git a/src/web/docs/vars.ts b/src/web/docs/vars.ts
index 2c744be61b..da590d7bd9 100644
--- a/src/web/docs/vars.ts
+++ b/src/web/docs/vars.ts
@@ -3,6 +3,7 @@ import * as glob from 'glob';
import * as yaml from 'js-yaml';
import langs from '../../../locales';
import config from '../../conf';
+const constants = require('../../const.json');
export default function(): { [key: string]: any } {
const vars = {} as { [key: string]: any };
@@ -38,5 +39,7 @@ export default function(): { [key: string]: any } {
vars['i18n'] = langs;
+ vars['copyright'] = constants.copyright;
+
return vars;
}