Merge remote-tracking branch 'origin/master' into fix/priority-style-issues

# Conflicts:
#	resources/css/common.css
#	src/main/frontend/components/block.cljs
#	src/main/frontend/components/block.css
#	src/main/frontend/components/right_sidebar.cljs
This commit is contained in:
charlie
2020-12-11 15:32:01 +08:00
20 changed files with 430 additions and 351 deletions

View File

@@ -93,7 +93,7 @@
[:div {:style {:margin-right "8px"}} title]
;; [:div {:style {:position "absolute" :right "8px"}}
;; icon]
]]
]]
(rum/with-key
(menu-link new-options child)
title)))])