💄 Minor cosmetic fixes.

This commit is contained in:
Andrey Antukh 2020-06-04 22:35:05 +02:00
parent 7efee0f0a9
commit c19b289ac8
5 changed files with 29 additions and 28 deletions

View file

@ -1175,7 +1175,7 @@
"en" : "Store libraries"
}
},
"workspace.options.canvas_background" : {
"workspace.options.canvas-background" : {
"used-in" : [ "src/uxbox/main/ui/workspace/sidebar/options/page.cljs:39" ],
"translations" : {
"en" : "Canvas background"

View file

@ -22,7 +22,7 @@
(mf/fnc frame-shape
{::mf/wrap-props false}
[props]
(let [children (unchecked-get props "children")
(let [childs (unchecked-get props "childs")
shape (unchecked-get props "shape")
{:keys [id x y width height]} shape
@ -36,7 +36,7 @@
:height height}))]
[:svg {:x x :y y :width width :height height}
[:> "rect" props]
(for [[i item] (d/enumerate children)]
(for [[i item] (d/enumerate childs)]
[:& shape-wrapper {:frame shape
:shape item
:key (:id item)}])])))

View file

@ -11,6 +11,7 @@
"The main container for a frame in viewer mode"
(:require
[rumext.alpha :as mf]
[uxbox.common.data :as d]
[uxbox.common.pages :as cp]
[uxbox.main.data.viewer :as dv]
[uxbox.main.refs :as refs]
@ -100,7 +101,6 @@
[show-interactions?]
(generic-wrapper-factory circle/circle-shape show-interactions?))
(declare shape-container-factory)
(defn frame-container-factory
@ -171,9 +171,10 @@
(gpt/negate)
(gmt/translate-matrix))
frame-id (:id frame)
modifier-ids (concat [frame-id] (cp/get-children frame-id objects))
update-fn #(assoc-in %1 [%2 :modifiers :displacement] modifier)
frame-id (:id frame)
modifier-ids (d/concat [frame-id] (cp/get-children frame-id objects))
objects (reduce update-fn objects modifier-ids)
frame (assoc-in frame [:modifiers :displacement] modifier)

View file

@ -121,5 +121,5 @@
[:*
[:& frame-shape
{:shape shape
:children children}]]])))))
:childs children}]]])))))

View file

@ -34,7 +34,7 @@
options (mf/deref refs/workspace-page-options)
handle-change-color (use-change-color page)]
[:div.element-set
[:div.element-set-title (t locale "workspace.options.canvas_background")]
[:div.element-set-title (t locale "workspace.options.canvas-background")]
[:div.element-set-content
[:& color-row {:disable-opacity true
:value {:value (get options :background "#E8E9EA")