Merge remote-tracking branch 'origin/master' into karelkryda_master

# Conflicts:
#	src/components/HeartbeatBar.vue
This commit is contained in:
Louis Lam
2022-05-18 19:49:54 +08:00
23 changed files with 307 additions and 88 deletions

View File

@@ -368,7 +368,7 @@ textarea.form-control {
.item {
display: block;
text-decoration: none;
padding: 13px 15px 10px 15px;
padding: 15px;
border-radius: 10px;
transition: all ease-in-out 0.15s;