diff --git a/src/const.json b/src/const.json index 924b4dd8b..0ee6ac206 100644 --- a/src/const.json +++ b/src/const.json @@ -1,4 +1,5 @@ { + "copyright": "Copyright (c) 2014-2017 syuilo", "themeColor": "#ff4e45", "themeColorForeground": "#fff" } diff --git a/src/web/app/common/tags/copyright.tag b/src/web/app/common/tags/copyright.tag deleted file mode 100644 index 9c3f1f648..000000000 --- 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 2f4e1181d..df99d93cc 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 b07b22c80..974f49a4f 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 380fb780b..191874caf 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 22d89375a..ee8018ec6 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 285b92bdb..32a2264f1 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 2c744be61..da590d7bd 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; } diff --git a/webpack/plugins/consts.ts b/webpack/plugins/consts.ts index 6e18fa296..16a569162 100644 --- a/webpack/plugins/consts.ts +++ b/webpack/plugins/consts.ts @@ -13,6 +13,7 @@ export default lang => { _RECAPTCHA_SITEKEY_: config.recaptcha.site_key, _SW_PUBLICKEY_: config.sw ? config.sw.public_key : null, _THEME_COLOR_: constants.themeColor, + _COPYRIGHT_: constants.copyright, _VERSION_: version, _STATUS_URL_: config.status_url, _STATS_URL_: config.stats_url,