summaryrefslogtreecommitdiff
path: root/src/web/app/desktop
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-02-17 03:01:00 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-02-17 03:01:00 +0900
commit684662a475685787eb2aa09158bc78a4e80fbf85 (patch)
tree5544331f6bde0aeac8c08b8e43e3294aa7466939 /src/web/app/desktop
parentwip (diff)
downloadmisskey-684662a475685787eb2aa09158bc78a4e80fbf85.tar.gz
misskey-684662a475685787eb2aa09158bc78a4e80fbf85.tar.bz2
misskey-684662a475685787eb2aa09158bc78a4e80fbf85.zip
wip
Diffstat (limited to 'src/web/app/desktop')
-rw-r--r--src/web/app/desktop/views/components/friends-maker.vue2
-rw-r--r--src/web/app/desktop/views/components/index.ts2
-rw-r--r--src/web/app/desktop/views/components/list-user.vue2
-rw-r--r--src/web/app/desktop/views/components/notifications.vue2
-rw-r--r--src/web/app/desktop/views/components/post-detail-sub.vue2
-rw-r--r--src/web/app/desktop/views/components/post-detail.vue2
-rw-r--r--src/web/app/desktop/views/components/posts-post.vue14
-rw-r--r--src/web/app/desktop/views/components/repost-form.vue2
-rw-r--r--src/web/app/desktop/views/components/timeline.vue2
-rw-r--r--src/web/app/desktop/views/components/ui-header-notifications.vue2
-rw-r--r--src/web/app/desktop/views/pages/user/user-friends.vue2
-rw-r--r--src/web/app/desktop/views/pages/user/user-home.vue2
-rw-r--r--src/web/app/desktop/views/pages/user/user-profile.vue2
13 files changed, 22 insertions, 16 deletions
diff --git a/src/web/app/desktop/views/components/friends-maker.vue b/src/web/app/desktop/views/components/friends-maker.vue
index add6c10a35..caa5f4913c 100644
--- a/src/web/app/desktop/views/components/friends-maker.vue
+++ b/src/web/app/desktop/views/components/friends-maker.vue
@@ -114,7 +114,7 @@ export default Vue.extend({
line-height 16px
color #ccc
- > mk-follow-button
+ > .mk-follow-button
position absolute
top 16px
right 16px
diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts
index 7a7438214e..1e4c2bafcd 100644
--- a/src/web/app/desktop/views/components/index.ts
+++ b/src/web/app/desktop/views/components/index.ts
@@ -26,6 +26,7 @@ import notifications from './notifications.vue';
import postForm from './post-form.vue';
import repostForm from './repost-form.vue';
import followButton from './follow-button.vue';
+import postPreview from './post-preview.vue';
Vue.component('mk-ui', ui);
Vue.component('mk-ui-header', uiHeader);
@@ -53,3 +54,4 @@ Vue.component('mk-notifications', notifications);
Vue.component('mk-post-form', postForm);
Vue.component('mk-repost-form', repostForm);
Vue.component('mk-follow-button', followButton);
+Vue.component('mk-post-preview', postPreview);
diff --git a/src/web/app/desktop/views/components/list-user.vue b/src/web/app/desktop/views/components/list-user.vue
index 28304e4755..adaa8f092c 100644
--- a/src/web/app/desktop/views/components/list-user.vue
+++ b/src/web/app/desktop/views/components/list-user.vue
@@ -93,7 +93,7 @@ export default Vue.extend({
font-size 1.1em
color #717171
- > mk-follow-button
+ > .mk-follow-button
position absolute
top 16px
right 16px
diff --git a/src/web/app/desktop/views/components/notifications.vue b/src/web/app/desktop/views/components/notifications.vue
index d211a933fd..f19766dc84 100644
--- a/src/web/app/desktop/views/components/notifications.vue
+++ b/src/web/app/desktop/views/components/notifications.vue
@@ -197,7 +197,7 @@ export default Vue.extend({
&:last-child
border-bottom none
- > mk-time
+ > .mk-time
display inline
position absolute
top 16px
diff --git a/src/web/app/desktop/views/components/post-detail-sub.vue b/src/web/app/desktop/views/components/post-detail-sub.vue
index 42f8be3b1c..8d81e6860a 100644
--- a/src/web/app/desktop/views/components/post-detail-sub.vue
+++ b/src/web/app/desktop/views/components/post-detail-sub.vue
@@ -119,7 +119,7 @@ export default Vue.extend({
font-size 1em
color #717171
- > mk-url-preview
+ > .mk-url-preview
margin-top 8px
</style>
diff --git a/src/web/app/desktop/views/components/post-detail.vue b/src/web/app/desktop/views/components/post-detail.vue
index 6c36f06fac..d23043dd40 100644
--- a/src/web/app/desktop/views/components/post-detail.vue
+++ b/src/web/app/desktop/views/components/post-detail.vue
@@ -280,7 +280,7 @@ export default Vue.extend({
font-size 1.5em
color #717171
- > mk-url-preview
+ > .mk-url-preview
margin-top 8px
> footer
diff --git a/src/web/app/desktop/views/components/posts-post.vue b/src/web/app/desktop/views/components/posts-post.vue
index 2a4c39a97b..e611b2513e 100644
--- a/src/web/app/desktop/views/components/posts-post.vue
+++ b/src/web/app/desktop/views/components/posts-post.vue
@@ -178,6 +178,7 @@ export default Vue.extend({
},
reply() {
document.body.appendChild(new MkPostFormWindow({
+ parent: this,
propsData: {
reply: this.p
}
@@ -185,6 +186,7 @@ export default Vue.extend({
},
repost() {
document.body.appendChild(new MkRepostFormWindow({
+ parent: this,
propsData: {
post: this.p
}
@@ -192,6 +194,7 @@ export default Vue.extend({
},
react() {
document.body.appendChild(new MkReactionPicker({
+ parent: this,
propsData: {
source: this.$refs.reactButton,
post: this.p
@@ -200,6 +203,7 @@ export default Vue.extend({
},
menu() {
document.body.appendChild(new MkPostMenu({
+ parent: this,
propsData: {
source: this.$refs.menuButton,
post: this.p
@@ -303,7 +307,7 @@ export default Vue.extend({
.name
font-weight bold
- > mk-time
+ > .mk-time
position absolute
top 16px
right 32px
@@ -317,7 +321,7 @@ export default Vue.extend({
padding 0 16px
background rgba(0, 0, 0, 0.0125)
- > mk-post-preview
+ > .mk-post-preview
background transparent
> article
@@ -415,7 +419,7 @@ export default Vue.extend({
> .dummy
display none
- mk-url-preview
+ .mk-url-preview
margin-top 8px
> .channel
@@ -451,7 +455,7 @@ export default Vue.extend({
background $theme-color
border-radius 4px
- > mk-poll
+ > .mk-poll
font-size 80%
> .repost
@@ -466,7 +470,7 @@ export default Vue.extend({
font-size 28px
background #fff
- > mk-post-preview
+ > .mk-post-preview
padding 16px
border dashed 1px #c0dac6
border-radius 8px
diff --git a/src/web/app/desktop/views/components/repost-form.vue b/src/web/app/desktop/views/components/repost-form.vue
index 9e9f7174f7..f0e4a2bdfc 100644
--- a/src/web/app/desktop/views/components/repost-form.vue
+++ b/src/web/app/desktop/views/components/repost-form.vue
@@ -58,7 +58,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
.mk-repost-form
- > mk-post-preview
+ > .mk-post-preview
margin 16px 22px
> div
diff --git a/src/web/app/desktop/views/components/timeline.vue b/src/web/app/desktop/views/components/timeline.vue
index b24e78fe45..63b36ff547 100644
--- a/src/web/app/desktop/views/components/timeline.vue
+++ b/src/web/app/desktop/views/components/timeline.vue
@@ -104,7 +104,7 @@ export default Vue.extend({
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px
- > mk-following-setuper
+ > .mk-following-setuper
border-bottom solid 1px #eee
> .loading
diff --git a/src/web/app/desktop/views/components/ui-header-notifications.vue b/src/web/app/desktop/views/components/ui-header-notifications.vue
index 779ee48864..5ffa28c917 100644
--- a/src/web/app/desktop/views/components/ui-header-notifications.vue
+++ b/src/web/app/desktop/views/components/ui-header-notifications.vue
@@ -148,7 +148,7 @@ export default Vue.extend({
border-bottom solid 14px #fff
border-left solid 14px transparent
- > mk-notifications
+ > .mk-notifications
max-height 350px
font-size 1rem
overflow auto
diff --git a/src/web/app/desktop/views/pages/user/user-friends.vue b/src/web/app/desktop/views/pages/user/user-friends.vue
index eed8748978..15fb7a96ea 100644
--- a/src/web/app/desktop/views/pages/user/user-friends.vue
+++ b/src/web/app/desktop/views/pages/user/user-friends.vue
@@ -109,7 +109,7 @@ export default Vue.extend({
line-height 16px
color #ccc
- > mk-follow-button
+ > .mk-follow-button
position absolute
top 16px
right 16px
diff --git a/src/web/app/desktop/views/pages/user/user-home.vue b/src/web/app/desktop/views/pages/user/user-home.vue
index 926a1f571e..dc0a03dabe 100644
--- a/src/web/app/desktop/views/pages/user/user-home.vue
+++ b/src/web/app/desktop/views/pages/user/user-home.vue
@@ -51,7 +51,7 @@ export default Vue.extend({
padding 16px
width calc(100% - 275px * 2)
- > mk-user-timeline
+ > .mk-user-timeline
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px
diff --git a/src/web/app/desktop/views/pages/user/user-profile.vue b/src/web/app/desktop/views/pages/user/user-profile.vue
index 6b88b47acd..66385ab2ec 100644
--- a/src/web/app/desktop/views/pages/user/user-profile.vue
+++ b/src/web/app/desktop/views/pages/user/user-profile.vue
@@ -87,7 +87,7 @@ export default Vue.extend({
padding 16px
border-top solid 1px #eee
- > mk-big-follow-button
+ > .mk-big-follow-button
width 100%
> .followed