Merge remote-tracking branch 'origin/developer' into developer

This commit is contained in:
Edwina Barbalan
2019-07-21 15:20:42 +02:00
3 changed files with 9 additions and 2 deletions
+2 -2
View File
@@ -4,9 +4,9 @@ Vue.component('MsgCard', {
<b>{{ msg.subject }}</b>
<img src="favicon.ico" width=20px height=20px>
</h6>
{{ msg.message }}<br><br>
{{ msg.message }}<br>
<a v-for="tag in msg.tag" @click="filterForTag(tag)">#{{ tag }} </a>
<!--<b-button class="tags" type="is-text" v-for="tag in msg.tag">#{{ tag }} </b-button>-->
<br>
</p>
<div class="om-card-footer"> <div class="om-user-line">
<i class="material-icons">account_circle</i>
+3
View File
@@ -239,3 +239,6 @@ button.clearButton {
border-color: #dbdbdb;
border-left: white;
}
.taglink {
color: #0046a0;
}
+4
View File
@@ -278,3 +278,7 @@ button.clearButton{
}
.taglink{
color: @color;
}