summaryrefslogtreecommitdiff
path: root/src/web/app/desktop
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-22 16:19:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-22 16:19:32 +0900
commitb646877e8bf73650859c52fc00a601da5b34bfc0 (patch)
tree347c7a8d7744b8da7d966fe0422dad6f38a8a610 /src/web/app/desktop
parent[Client] Fix design (diff)
downloadmisskey-b646877e8bf73650859c52fc00a601da5b34bfc0.tar.gz
misskey-b646877e8bf73650859c52fc00a601da5b34bfc0.tar.bz2
misskey-b646877e8bf73650859c52fc00a601da5b34bfc0.zip
#309 and some cleanups
Diffstat (limited to 'src/web/app/desktop')
-rw-r--r--src/web/app/desktop/assets/header-logo-white.svg (renamed from src/web/app/desktop/resources/header-logo-white.svg)0
-rw-r--r--src/web/app/desktop/assets/header-logo.svg (renamed from src/web/app/desktop/resources/header-logo.svg)0
-rw-r--r--src/web/app/desktop/assets/remove.png (renamed from src/web/app/desktop/resources/remove.png)bin3115 -> 3115 bytes
-rw-r--r--src/web/app/desktop/tags/drive/file.tag6
-rw-r--r--src/web/app/desktop/tags/pages/entrance.tag2
-rw-r--r--src/web/app/desktop/tags/post-form.tag2
-rw-r--r--src/web/app/desktop/tags/ui-header.tag2
7 files changed, 6 insertions, 6 deletions
diff --git a/src/web/app/desktop/resources/header-logo-white.svg b/src/web/app/desktop/assets/header-logo-white.svg
index f31d6a7a6b..f31d6a7a6b 100644
--- a/src/web/app/desktop/resources/header-logo-white.svg
+++ b/src/web/app/desktop/assets/header-logo-white.svg
diff --git a/src/web/app/desktop/resources/header-logo.svg b/src/web/app/desktop/assets/header-logo.svg
index 19b8a2737e..19b8a2737e 100644
--- a/src/web/app/desktop/resources/header-logo.svg
+++ b/src/web/app/desktop/assets/header-logo.svg
diff --git a/src/web/app/desktop/resources/remove.png b/src/web/app/desktop/assets/remove.png
index 8b1f4c06c9..8b1f4c06c9 100644
--- a/src/web/app/desktop/resources/remove.png
+++ b/src/web/app/desktop/assets/remove.png
Binary files 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