From b646877e8bf73650859c52fc00a601da5b34bfc0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 Mar 2017 16:19:32 +0900
Subject: #309 and some cleanups

---
 src/web/app/auth/assets/logo.svg                    |   7 +++++++
 src/web/app/auth/resources/logo.svg                 |   7 -------
 src/web/app/auth/tags/index.tag                     |   2 +-
 src/web/app/auth/view.pug                           |   2 +-
 src/web/app/base.pug                                |   4 ++--
 src/web/app/client/script.js                        |   4 ++--
 src/web/app/client/view.pug                         |   2 +-
 src/web/app/common/tags/core-error.tag              |   2 +-
 src/web/app/common/tags/messaging/index.tag         |   2 +-
 src/web/app/common/tags/messaging/message.tag       |   2 +-
 src/web/app/desktop/assets/header-logo-white.svg    |   7 +++++++
 src/web/app/desktop/assets/header-logo.svg          |   7 +++++++
 src/web/app/desktop/assets/remove.png               | Bin 0 -> 3115 bytes
 src/web/app/desktop/resources/header-logo-white.svg |   7 -------
 src/web/app/desktop/resources/header-logo.svg       |   7 -------
 src/web/app/desktop/resources/remove.png            | Bin 3115 -> 0 bytes
 src/web/app/desktop/tags/drive/file.tag             |   6 +++---
 src/web/app/desktop/tags/pages/entrance.tag         |   2 +-
 src/web/app/desktop/tags/post-form.tag              |   2 +-
 src/web/app/desktop/tags/ui-header.tag              |   2 +-
 src/web/app/dev/view.pug                            |   2 +-
 src/web/app/mobile/tags/page/entrance.tag           |   2 +-
 22 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 src/web/app/auth/assets/logo.svg
 delete mode 100644 src/web/app/auth/resources/logo.svg
 create mode 100644 src/web/app/desktop/assets/header-logo-white.svg
 create mode 100644 src/web/app/desktop/assets/header-logo.svg
 create mode 100644 src/web/app/desktop/assets/remove.png
 delete mode 100644 src/web/app/desktop/resources/header-logo-white.svg
 delete mode 100644 src/web/app/desktop/resources/header-logo.svg
 delete mode 100644 src/web/app/desktop/resources/remove.png

(limited to 'src/web/app')

diff --git a/src/web/app/auth/assets/logo.svg b/src/web/app/auth/assets/logo.svg
new file mode 100644
index 0000000000..19b8a2737e
--- /dev/null
+++ b/src/web/app/auth/assets/logo.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
+<polyline opacity="0.5" fill="none" stroke="#000000" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
+</svg>
diff --git a/src/web/app/auth/resources/logo.svg b/src/web/app/auth/resources/logo.svg
deleted file mode 100644
index 19b8a2737e..0000000000
--- a/src/web/app/auth/resources/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
-<polyline opacity="0.5" fill="none" stroke="#000000" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
-</svg>
diff --git a/src/web/app/auth/tags/index.tag b/src/web/app/auth/tags/index.tag
index 218101f3dd..6bc545df3b 100644
--- a/src/web/app/auth/tags/index.tag
+++ b/src/web/app/auth/tags/index.tag
@@ -23,7 +23,7 @@
 		<h1>サインインしてください</h1>
 		<mk-signin></mk-signin>
 	</main>
-	<footer><img src="/resources/auth/logo.svg" alt="Misskey"/></footer>
+	<footer><img src="/assets/auth/logo.svg" alt="Misskey"/></footer>
 	<style>
 		:scope
 			display block
diff --git a/src/web/app/auth/view.pug b/src/web/app/auth/view.pug
index 03ec4e6f72..ae2a652022 100644
--- a/src/web/app/auth/view.pug
+++ b/src/web/app/auth/view.pug
@@ -2,4 +2,4 @@ extends ../base
 
 block head
 	meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
-	script(src=`/resources/auth/script.${version}.js` async defer)
+	script(src=`/assets/auth/script.${version}.js` async defer)
diff --git a/src/web/app/base.pug b/src/web/app/base.pug
index 90fb7b24a2..d1095f6466 100644
--- a/src/web/app/base.pug
+++ b/src/web/app/base.pug
@@ -1,6 +1,6 @@
 doctype html
 
-!= '\r\n<!-- Thank you for using Misskey! @syuilo -->\r\n'
+!= '\n<!-- Thank you for using Misskey! @syuilo -->\n'
 
 html(lang='ja' dir='ltr')
 
@@ -11,7 +11,7 @@ html(lang='ja' dir='ltr')
 		meta(name='referrer' content='origin')
 		title Misskey
 		style
-			include ./../../../built/web/resources/init.css
+			include ./../../../built/web/assets/init.css
 		script(src='https://use.fontawesome.com/22aba0df4f.js' async)
 		block head
 
diff --git a/src/web/app/client/script.js b/src/web/app/client/script.js
index ee07edd60d..0f0fd7aa45 100644
--- a/src/web/app/client/script.js
+++ b/src/web/app/client/script.js
@@ -15,7 +15,7 @@
 	 */
 	function mountDesktop() {
 		const script = document.createElement('script');
-		script.setAttribute('src', `/resources/desktop/script.${VERSION}.js`);
+		script.setAttribute('src', `/assets/desktop/script.${VERSION}.js`);
 		script.setAttribute('async', 'true');
 		script.setAttribute('defer', 'true');
 		head.appendChild(script);
@@ -31,7 +31,7 @@
 		head.appendChild(meta);
 
 		const script = document.createElement('script');
-		script.setAttribute('src', `/resources/mobile/script.${VERSION}.js`);
+		script.setAttribute('src', `/assets/mobile/script.${VERSION}.js`);
 		script.setAttribute('async', 'true');
 		script.setAttribute('defer', 'true');
 		head.appendChild(script);
diff --git a/src/web/app/client/view.pug b/src/web/app/client/view.pug
index 6f0ff3cd5c..3441631cd7 100644
--- a/src/web/app/client/view.pug
+++ b/src/web/app/client/view.pug
@@ -2,4 +2,4 @@ extends ../base
 
 block head
 	script
-		include ./../../../../built/web/resources/client/script.js
+		include ./../../../../built/web/assets/client/script.js
diff --git a/src/web/app/common/tags/core-error.tag b/src/web/app/common/tags/core-error.tag
index b903ba3e81..dd6f994ea2 100644
--- a/src/web/app/common/tags/core-error.tag
+++ b/src/web/app/common/tags/core-error.tag
@@ -1,6 +1,6 @@
 <mk-core-error>
 	<!--i: i.fa.fa-times-circle-->
-	<img src="/resources/error.jpg" alt=""/>
+	<img src="/assets/error.jpg" alt=""/>
 	<h1>サーバーに接続できません</h1>
 	<p class="text">インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから<a onclick={ retry }>再度お試し</a>ください。</p>
 	<p class="thanks">いつもMisskeyをご利用いただきありがとうございます。</p>
diff --git a/src/web/app/common/tags/messaging/index.tag b/src/web/app/common/tags/messaging/index.tag
index 8f3f1ed98f..8677c9c7c6 100644
--- a/src/web/app/common/tags/messaging/index.tag
+++ b/src/web/app/common/tags/messaging/index.tag
@@ -191,7 +191,7 @@
 
 					&:not([data-is-me]):not([data-is-read])
 						> div
-							background-image url("/resources/unread.svg")
+							background-image url("/assets/unread.svg")
 							background-repeat no-repeat
 							background-position 0 center
 
diff --git a/src/web/app/common/tags/messaging/message.tag b/src/web/app/common/tags/messaging/message.tag
index 6d2651e5a1..21c601157c 100644
--- a/src/web/app/common/tags/messaging/message.tag
+++ b/src/web/app/common/tags/messaging/message.tag
@@ -2,7 +2,7 @@
 	<div class="content-container">
 		<div class="balloon">
 			<p class="read" if={ message.is_me && message.is_read }>既読</p>
-			<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/resources/desktop/messaging/delete.png" alt="Delete"/></button>
+			<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/assets/desktop/messaging/delete.png" alt="Delete"/></button>
 			<div class="content" if={ !message.is_deleted }>
 				<div ref="text"></div>
 				<div class="image" if={ message.file }><img src={ message.file.url } alt="image" title={ message.file.name }/></div>
diff --git a/src/web/app/desktop/assets/header-logo-white.svg b/src/web/app/desktop/assets/header-logo-white.svg
new file mode 100644
index 0000000000..f31d6a7a6b
--- /dev/null
+++ b/src/web/app/desktop/assets/header-logo-white.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
+<polyline opacity="0.5" fill="none" stroke="#fff" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
+</svg>
diff --git a/src/web/app/desktop/assets/header-logo.svg b/src/web/app/desktop/assets/header-logo.svg
new file mode 100644
index 0000000000..19b8a2737e
--- /dev/null
+++ b/src/web/app/desktop/assets/header-logo.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
+<polyline opacity="0.5" fill="none" stroke="#000000" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
+</svg>
diff --git a/src/web/app/desktop/assets/remove.png b/src/web/app/desktop/assets/remove.png
new file mode 100644
index 0000000000..8b1f4c06c9
Binary files /dev/null and b/src/web/app/desktop/assets/remove.png differ
diff --git a/src/web/app/desktop/resources/header-logo-white.svg b/src/web/app/desktop/resources/header-logo-white.svg
deleted file mode 100644
index f31d6a7a6b..0000000000
--- a/src/web/app/desktop/resources/header-logo-white.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
-<polyline opacity="0.5" fill="none" stroke="#fff" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
-</svg>
diff --git a/src/web/app/desktop/resources/header-logo.svg b/src/web/app/desktop/resources/header-logo.svg
deleted file mode 100644
index 19b8a2737e..0000000000
--- a/src/web/app/desktop/resources/header-logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
-<polyline opacity="0.5" fill="none" stroke="#000000" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
-</svg>
diff --git a/src/web/app/desktop/resources/remove.png b/src/web/app/desktop/resources/remove.png
deleted file mode 100644
index 8b1f4c06c9..0000000000
Binary files a/src/web/app/desktop/resources/remove.png and /dev/null differ
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index 7da0f8b0d0..98e8a98a13 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -1,11 +1,11 @@
 <mk-drive-browser-file data-is-selected={ isSelected } data-is-contextmenu-showing={ isContextmenuShowing.toString() } onclick={ onclick } oncontextmenu={ oncontextmenu } draggable="true" ondragstart={ ondragstart } ondragend={ ondragend } title={ title }>
-	<div class="label" if={ I.avatar_id == file.id }><img src="/resources/label.svg"/>
+	<div class="label" if={ I.avatar_id == file.id }><img src="/assets/label.svg"/>
 		<p>アバター</p>
 	</div>
-	<div class="label" if={ I.banner_id == file.id }><img src="/resources/label.svg"/>
+	<div class="label" if={ I.banner_id == file.id }><img src="/assets/label.svg"/>
 		<p>バナー</p>
 	</div>
-	<div class="label" if={ I.data.wallpaper == file.id }><img src="/resources/label.svg"/>
+	<div class="label" if={ I.data.wallpaper == file.id }><img src="/assets/label.svg"/>
 		<p>壁紙</p>
 	</div>
 	<div class="thumbnail"><img src={ file.url + '?thumbnail&size=128' } alt=""/></div>
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index c6f0f5c90e..a9fb58ddb1 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -1,6 +1,6 @@
 <mk-entrance>
 	<main>
-		<img src="/resources/title.svg" alt="Misskey"/>
+		<img src="/assets/title.svg" alt="Misskey"/>
 		<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
 		<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
 		<div class="introduction" if={ mode == 'introduction' }>
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index 922cb74271..1f6303bcb1 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -5,7 +5,7 @@
 			<ul>
 				<li each={ files }>
 					<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name }></div>
-					<img class="remove" onclick={ removeFile } src="/resources/desktop/remove.png" title="添付取り消し" alt=""/>
+					<img class="remove" onclick={ removeFile } src="/assets/desktop/remove.png" title="添付取り消し" alt=""/>
 				</li>
 				<li class="add" if={ files.length < 4 } title="PCからファイルを添付" onclick={ selectFile }><i class="fa fa-plus"></i></li>
 			</ul>
diff --git a/src/web/app/desktop/tags/ui-header.tag b/src/web/app/desktop/tags/ui-header.tag
index 5eb7156622..6ab4063d80 100644
--- a/src/web/app/desktop/tags/ui-header.tag
+++ b/src/web/app/desktop/tags/ui-header.tag
@@ -45,7 +45,7 @@
 						display block
 						width 100%
 						height 48px
-						background-image url(/resources/desktop/header-logo-white.svg)
+						background-image url(/assets/desktop/header-logo-white.svg)
 						background-size 64px
 						background-position center
 						background-repeat no-repeat
diff --git a/src/web/app/dev/view.pug b/src/web/app/dev/view.pug
index 8d21c7e714..b8bbddb50c 100644
--- a/src/web/app/dev/view.pug
+++ b/src/web/app/dev/view.pug
@@ -1,4 +1,4 @@
 extends ../base
 
 block head
-	script(src=`/resources/dev/script.${version}.js` async defer)
+	script(src=`/assets/dev/script.${version}.js` async defer)
diff --git a/src/web/app/mobile/tags/page/entrance.tag b/src/web/app/mobile/tags/page/entrance.tag
index 42b308e3e2..0ad530eb71 100644
--- a/src/web/app/mobile/tags/page/entrance.tag
+++ b/src/web/app/mobile/tags/page/entrance.tag
@@ -1,5 +1,5 @@
 <mk-entrance>
-	<main><img src="/resources/title.svg" alt="Misskey"/>
+	<main><img src="/assets/title.svg" alt="Misskey"/>
 		<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
 		<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
 		<div class="introduction" if={ mode == 'introduction' }>
-- 
cgit v1.2.3-freya