diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-02-22 03:13:19 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-02-22 03:13:19 +0900 |
| commit | d9703eab67feeecde189ab81c39b02d90f53be85 (patch) | |
| tree | d58acfc22283624ffa1dc1224d2f77ebefe69549 /src/web | |
| parent | Merge pull request #193 from syuilo/no-tag-ls (diff) | |
| download | misskey-d9703eab67feeecde189ab81c39b02d90f53be85.tar.gz misskey-d9703eab67feeecde189ab81c39b02d90f53be85.tar.bz2 misskey-d9703eab67feeecde189ab81c39b02d90f53be85.zip | |
Clean up
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/app/base.pug | 4 | ||||
| -rw-r--r-- | src/web/app/boot.js | 2 | ||||
| -rw-r--r-- | src/web/app/client/script.js | 46 | ||||
| -rw-r--r-- | src/web/app/init.css | 24 |
4 files changed, 39 insertions, 37 deletions
diff --git a/src/web/app/base.pug b/src/web/app/base.pug index 805feaee6c..e65726fba5 100644 --- a/src/web/app/base.pug +++ b/src/web/app/base.pug @@ -16,8 +16,8 @@ html(lang='ja', dir='ltr') block head body - noscript: div: p JavaScriptを有効にしてください - div#init: p + noscript: p JavaScriptを有効にしてください + div#ini: p span . span . span . diff --git a/src/web/app/boot.js b/src/web/app/boot.js index 06e457e2b3..6399accd33 100644 --- a/src/web/app/boot.js +++ b/src/web/app/boot.js @@ -94,7 +94,7 @@ module.exports = callback => { mixins(me); - const init = document.getElementById('init'); + const init = document.getElementById('ini'); init.parentNode.removeChild(init); const app = document.createElement('div'); diff --git a/src/web/app/client/script.js b/src/web/app/client/script.js index 880500eb1b..c049198065 100644 --- a/src/web/app/client/script.js +++ b/src/web/app/client/script.js @@ -1,26 +1,28 @@ -const head = document.getElementsByTagName('head')[0]; -const ua = navigator.userAgent.toLowerCase(); -const isMobile = /mobile|iphone|ipad|android/.test(ua); +(() => { + const head = document.getElementsByTagName('head')[0]; + const ua = navigator.userAgent.toLowerCase(); + const isMobile = /mobile|iphone|ipad|android/.test(ua); -isMobile ? mountMobile() : mountDesktop(); + isMobile ? mountMobile() : mountDesktop(); -function mountDesktop() { - const script = document.createElement('script'); - script.setAttribute('src', '/_/resources/desktop/script.js'); - script.setAttribute('async', 'true'); - script.setAttribute('defer', 'true'); - head.appendChild(script); -} + function mountDesktop() { + const script = document.createElement('script'); + script.setAttribute('src', '/_/resources/desktop/script.js'); + script.setAttribute('async', 'true'); + script.setAttribute('defer', 'true'); + head.appendChild(script); + } -function mountMobile() { - const meta = document.createElement('meta'); - meta.setAttribute('name', 'viewport'); - meta.setAttribute('content', 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no'); - head.appendChild(meta); + function mountMobile() { + const meta = document.createElement('meta'); + meta.setAttribute('name', 'viewport'); + meta.setAttribute('content', 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no'); + head.appendChild(meta); - const script = document.createElement('script'); - script.setAttribute('src', '/_/resources/mobile/script.js'); - script.setAttribute('async', 'true'); - script.setAttribute('defer', 'true'); - head.appendChild(script); -} + const script = document.createElement('script'); + script.setAttribute('src', '/_/resources/mobile/script.js'); + script.setAttribute('async', 'true'); + script.setAttribute('defer', 'true'); + head.appendChild(script); + } +})(); diff --git a/src/web/app/init.css b/src/web/app/init.css index 2a277a9c84..c92f30b443 100644 --- a/src/web/app/init.css +++ b/src/web/app/init.css @@ -4,9 +4,9 @@ html { font-family: sans-serif; } -body > noscript > div { +body > noscript { position: fixed; - z-index: 32768; + z-index: 2; top: 0; left: 0; width: 100%; @@ -14,16 +14,16 @@ body > noscript > div { text-align: center; background: #fff; } - body > noscript > div > p { + body > noscript > p { display: block; margin: 32px; font-size: 2em; color: #555; } -#init { +#ini { position: fixed; - z-index: 16384; + z-index: 1; top: 0; left: 0; width: 100%; @@ -32,27 +32,27 @@ body > noscript > div { background: #fff; cursor: wait; } - #init > p { + #ini > p { display: block; user-select: none; margin: 32px; font-size: 4em; color: #555; } - #init > p > span { - animation: init 1.4s infinite ease-in-out both; + #ini > p > span { + animation: ini 1.4s infinite ease-in-out both; } - #init > p > span:nth-child(1) { + #ini > p > span:nth-child(1) { animation-delay: 0s; } - #init > p > span:nth-child(2) { + #ini > p > span:nth-child(2) { animation-delay: 0.16s; } - #init > p > span:nth-child(3) { + #ini > p > span:nth-child(3) { animation-delay: 0.32s; } -@keyframes init { +@keyframes ini { 0%, 80%, 100% { opacity: 1; } |