3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-30 02:56:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/refactor-ui' into refactor-ui-integration

Browse source
This commit is contained in:
Andrey Antukh 2019-12-18 18:16:14 +01:00
commit c487f77b89
11 changed files with 80 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/uxbox/main/ui/workspace/header.cljs
View file

@ -58,7 +58,7 @@
{:alt (tr "header.sitemap")
:class (when (contains? layout :sitemap) "selected")
:on-click #(st/emit! (dw/toggle-layout-flag :sitemap))}
i/project-tree
;; i/project-tree
[:span {} "Project name / File name";(:name page)
]]

3
frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
View file

@ -260,7 +260,8 @@
[:div.tool-window-bar
[:div.tool-window-icon i/layers]
[:span (tr "ds.settings.layers")]
[:div.tool-window-close {:on-click on-click} i/close]]
;; [:div.tool-window-close {:on-click on-click} i/close]
]
[:div.tool-window-content
[:& canvas-list {:canvas canvas
:shapes all-shapes

8
frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs
View file

@ -113,10 +113,10 @@
(let [close #(st/emit! (udw/toggle-layout-flag :element-options))
selected (mf/deref refs/selected-shapes)]
[:div.elementa-options.tool-window
[:div.tool-window-bar
[:div.tool-window-icon i/options]
[:span (tr "ds.settings.element-options")]
[:div.tool-window-close {:on-click close} i/close]]
;; [:div.tool-window-bar
;; [:div.tool-window-icon i/options]
;; [:span (tr "ds.settings.element-options")]
;; [:div.tool-window-close {:on-click close} i/close]]
[:div.tool-window-content
[:div.element-options
(if (= (count selected) 1)