Merge remote-tracking branch 'origin/master' into feat/support-remove-image

# Conflicts:
#	src/main/frontend/components/block.cljs
This commit is contained in:
charlie
2021-01-15 17:47:00 +08:00
7 changed files with 122 additions and 40 deletions

View File

@@ -706,3 +706,8 @@ hr {
margin: 2rem 0;
border-color: var(--ls-border-color, #ccc);
}
.resize {
resize: both;
overflow: hidden;
}