Merge branch 'master' into customstatuspage

# Conflicts:
#	src/languages/de-DE.js
This commit is contained in:
Louis Lam
2022-04-17 13:21:41 +08:00
93 changed files with 1057 additions and 471 deletions

View File

@@ -25,9 +25,9 @@ export default {
MonitorList,
},
data() {
return {}
return {};
},
}
};
</script>
<style lang="scss" scoped>

View File

@@ -118,6 +118,7 @@ export default {
return 0;
});
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
this.heartBeatList = result;
return result;

View File

@@ -11,6 +11,6 @@ export default {
components: {
MonitorList,
},
}
};
</script>

View File

@@ -92,7 +92,6 @@ export default {
}
.info {
.title {
font-weight: bold;
font-size: 20px;

View File

@@ -283,6 +283,7 @@ const toast = useToast();
const leavePageMsg = "Do you really want to leave? you have unsaved changes!";
// eslint-disable-next-line no-unused-vars
let feedInterval;
const favicon = new Favico({
@@ -864,7 +865,7 @@ footer {
.incident, .customize {
.content {
&[contenteditable=true] {
&[contenteditable="true"] {
min-height: 60px;
}
}