Merge remote-tracking branch 'origin/master' into feature-improve-status-styling

# Conflicts:
#	src/components/HeartbeatBar.vue
#	src/components/PublicGroupList.vue
This commit is contained in:
Louis Lam 2022-05-14 14:05:28 +08:00
commit 749ca6f4a8
199 changed files with 18437 additions and 6053 deletions

View file

@ -41,7 +41,7 @@
<Uptime :monitor="monitor.element" type="24" :pill="true" />
{{ monitor.element.name }}
</div>
<div v-if="monitor.element.tags.length" class="tags">
<div v-if="showTags && monitor.element.tags.length > 0" class="tags">
<Tag v-for="tag in monitor.element.tags" :key="tag" :item="tag" :size="'sm'" />
</div>
</div>
@ -76,6 +76,9 @@ export default {
type: Boolean,
required: true,
},
showTags: {
type: Boolean,
}
},
data() {
return {
@ -142,7 +145,7 @@ export default {
.mobile {
.item {
padding: 13px 0 10px 0;
padding: 13px 0 10px;
}
}