moving mentions into separate row
This commit is contained in:
parent
0583a6b863
commit
3abd357694
8 changed files with 94 additions and 21 deletions
|
@ -14,8 +14,14 @@ const MentionLink = {
|
|||
type: String
|
||||
},
|
||||
origattrs: {
|
||||
required: true,
|
||||
type: Object
|
||||
required: false,
|
||||
type: Object,
|
||||
default: {}
|
||||
},
|
||||
firstMention: {
|
||||
required: false,
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
@ -61,6 +67,16 @@ const MentionLink = {
|
|||
return rest
|
||||
}
|
||||
},
|
||||
classnames () {
|
||||
return [
|
||||
{
|
||||
'-you': this.isYou,
|
||||
'-highlighted': this.highlight,
|
||||
'-firstMention': this.firstMention
|
||||
},
|
||||
this.highlightType
|
||||
]
|
||||
},
|
||||
...mapGetters(['mergedConfig']),
|
||||
...mapState({
|
||||
currentUser: state => state.users.currentUser
|
||||
|
|
|
@ -39,10 +39,15 @@
|
|||
}
|
||||
|
||||
.new {
|
||||
&.-firstMention {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&,
|
||||
&.-highlighted {
|
||||
.short {
|
||||
line-height: 1.5;
|
||||
font-size: inherit;
|
||||
|
||||
&::before {
|
||||
display: inline-block;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
v-if="user"
|
||||
class="new"
|
||||
:style="style"
|
||||
:class="[{ '-you': isYou, '-highlighted': highlight }, highlightType]"
|
||||
:class="classnames"
|
||||
>
|
||||
<button
|
||||
class="short button-default"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue