Compare commits
No commits in common. "6d8dcec15286e6d428ab39bcd33691de7bedb87e" and "c71b0b46d879f5c68c7dbdf3b24a9754772d48aa" have entirely different histories.
6d8dcec152
...
c71b0b46d8
|
|
@ -270,7 +270,12 @@
|
|||
|
||||
<style scoped>
|
||||
.entry.unread {
|
||||
outline: 1px solid #ccc;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.unread {
|
||||
box-shadow: 0 4px 8px 0 rgba(255, 255, 0, 0.8), 0 6px 20px 0 rgba(255, 255, 0, 0.5);
|
||||
}
|
||||
|
||||
.media .entry {
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
},
|
||||
}).then(() => {
|
||||
this.newPost = '';
|
||||
this.$emit('close')
|
||||
})
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
},
|
||||
handleScroll() {
|
||||
// let bottomOfWindow = document.documentElement.scrollTop + window.innerHeight === document.documentElement.offsetHeight;
|
||||
let bottomOfWindow = document.documentElement.scrollTop + window.innerHeight >= this.$el.offsetHeight + document.documentElement.offsetHeight
|
||||
let bottomOfWindow = document.documentElement.scrollTop + window.innerHeight === this.$el.offsetHeight + document.documentElement.offsetHeight + 12
|
||||
if (bottomOfWindow) {
|
||||
this.$store.dispatch('bottomReached')
|
||||
return
|
||||
|
|
|
|||
|
|
@ -7,20 +7,9 @@
|
|||
</Channels>
|
||||
|
||||
<div class="timeline column is-three-fifths">
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<h1 class="title is-5">{{ channel.name }}</h1>
|
||||
</div>
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<button class="button" @click.prevent="openPost">New Post</button>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<button class="button" @click.prevent="openFeedFollower('')">Add feed</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<new-post class="mt-20" v-if="showPost" @close="showPost = false"></new-post>
|
||||
<button class="button" @click="openFeedFollower">Add feed</button>
|
||||
<new-post class="mt-20"></new-post>
|
||||
<h1 class="title is-5 mt-20">{{ channel.name }}</h1>
|
||||
<Timeline style="margin-top:20px" :timeline="this.$store.state.timeline" :channel="channel"
|
||||
@getPage="getPage" @followFeed="openFeedFollower(arguments[0])"></Timeline>
|
||||
</div>
|
||||
|
|
@ -54,8 +43,7 @@
|
|||
data() {
|
||||
return {
|
||||
feedFollowerIsOpen: false,
|
||||
feedFollowerQuery: '',
|
||||
showPost: false
|
||||
feedFollowerQuery: ''
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -70,6 +58,8 @@
|
|||
|
||||
methods: {
|
||||
openFeedFollower(query) {
|
||||
// eslint-disable-next-line
|
||||
console.log(query)
|
||||
this.feedFollowerIsOpen = true
|
||||
this.feedFollowerQuery = query
|
||||
},
|
||||
|
|
@ -87,9 +77,6 @@
|
|||
this.$store.dispatch('fetchTimeline', next).then(() => {
|
||||
window.scrollTo({top: 0})
|
||||
})
|
||||
},
|
||||
openPost() {
|
||||
this.showPost = true
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user