summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-11 18:56:15 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-11 18:56:15 +0900
commit08e83e1374333fe8983a597e6cd0ca109d9788e8 (patch)
tree8920e989fa8ea116ffaa616d502010b6f42992da /src/web
parent#258 (diff)
downloadmisskey-08e83e1374333fe8983a597e6cd0ca109d9788e8.tar.gz
misskey-08e83e1374333fe8983a597e6cd0ca109d9788e8.tar.bz2
misskey-08e83e1374333fe8983a597e6cd0ca109d9788e8.zip
:v:
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/desktop/tags/post-form-window.tag2
-rw-r--r--src/web/app/desktop/tags/repost-form-window.tag10
-rw-r--r--src/web/app/desktop/tags/window.tag21
3 files changed, 9 insertions, 24 deletions
diff --git a/src/web/app/desktop/tags/post-form-window.tag b/src/web/app/desktop/tags/post-form-window.tag
index 956e83ac6e..adc70a93fb 100644
--- a/src/web/app/desktop/tags/post-form-window.tag
+++ b/src/web/app/desktop/tags/post-form-window.tag
@@ -1,5 +1,5 @@
<mk-post-form-window>
- <mk-window ref="window" is-modal={ true } colored={ true }>
+ <mk-window ref="window" is-modal={ true }>
<yield to="header">
<span if={ !parent.opts.reply }>新規投稿</span>
<span if={ parent.opts.reply }>返信</span>
diff --git a/src/web/app/desktop/tags/repost-form-window.tag b/src/web/app/desktop/tags/repost-form-window.tag
index 75fe9f4829..0f2a139fea 100644
--- a/src/web/app/desktop/tags/repost-form-window.tag
+++ b/src/web/app/desktop/tags/repost-form-window.tag
@@ -1,7 +1,11 @@
<mk-repost-form-window>
- <mk-window ref="window" is-modal={ true } colored={ true }><yield to="header"><i class="fa fa-retweet"></i>この投稿をRepostしますか?</yield>
-<yield to="content">
- <mk-repost-form ref="form" post={ parent.opts.post }></mk-repost-form></yield>
+ <mk-window ref="window" is-modal={ true }>
+ <yield to="header">
+ <i class="fa fa-retweet"></i>この投稿をRepostしますか?
+ </yield>
+ <yield to="content">
+ <mk-repost-form ref="form" post={ parent.opts.post }></mk-repost-form>
+ </yield>
</mk-window>
<style>
:scope
diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index 3e7da90769..55bb666239 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -1,4 +1,4 @@
-<mk-window data-flexible={ isFlexible } data-colored={ opts.colored } ondragover={ ondragover }>
+<mk-window data-flexible={ isFlexible } ondragover={ ondragover }>
<div class="bg" ref="bg" show={ isModal } onclick={ bgClick }></div>
<div class="main" ref="main" tabindex="-1" data-is-modal={ isModal } onmousedown={ onBodyMousedown } onkeydown={ onKeydown }>
<div class="body">
@@ -171,25 +171,6 @@
> .main > .body > .content
height calc(100% - 40px)
- &[data-colored]
-
- > .main > .body
-
- > header
- box-shadow 0 1px 0 rgba($theme-color, 0.1)
-
- > h1
- color #d0b4ac
-
- > .close
- color rgba($theme-color, 0.4)
-
- &:hover
- color rgba($theme-color, 0.6)
-
- &:active
- color darken($theme-color, 30%)
-
</style>
<script>
const contains = require('../../common/scripts/contains');