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

✨ Remove advanced options overlay and single option when advanced options displayed

Browse source
This commit is contained in:
alonso.torres 2021-06-09 11:18:47 +02:00
parent a2b0305162
commit c4b4976be0
5 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,9 +22,7 @@
(.scrollIntoViewIfNeeded ^js node))))) (.scrollIntoViewIfNeeded ^js node)))))
(when visible? (when visible?
[:* [:div.advanced-options-wrapper {:ref ref}
[:div.focus-overlay {:on-click handle-click}] [:div.advanced-options {}
[:div.advanced-options-wrapper {:ref ref} children]])))
[:div.advanced-options {}
children]]])))

1
frontend/src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
View file

@ -13,7 +13,6 @@
[app.main.data.workspace.changes :as dch] [app.main.data.workspace.changes :as dch]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.icons :as i] [app.main.ui.icons :as i]
[app.main.ui.workspace.sidebar.options.common :refer [advanced-options]]
[app.main.ui.workspace.sidebar.options.rows.input-row :refer [input-row]] [app.main.ui.workspace.sidebar.options.rows.input-row :refer [input-row]]
[app.util.dom :as dom] [app.util.dom :as dom]
[app.util.i18n :as i18n :refer [t]])) [app.util.i18n :as i18n :refer [t]]))

13
frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs
View file

@ -117,11 +117,13 @@
(on-save-grid grid))) (on-save-grid grid)))
is-default (= (->> grid :params) is-default (= (->> grid :params)
(->> grid :type default-grid-params))] (->> grid :type default-grid-params))
open? (:show-advanced-options @state)]
[:div.grid-option [:div.grid-option
[:div.grid-option-main [:div.grid-option-main {:style {:display (when open? "none")}}
[:button.custom-button {:class (when (:show-advanced-options @state) "is-active") [:button.custom-button {:class (when open? "is-active")
:on-click toggle-advanced-options} i/actions] :on-click toggle-advanced-options} i/actions]
[:& select {:class "flex-grow" [:& select {:class "flex-grow"
@ -148,10 +150,9 @@
[:button.custom-button {:on-click handle-toggle-visibility} (if display i/eye i/eye-closed)] [:button.custom-button {:on-click handle-toggle-visibility} (if display i/eye i/eye-closed)]
[:button.custom-button {:on-click handle-remove-grid} i/minus]]] [:button.custom-button {:on-click handle-remove-grid} i/minus]]]
[:& advanced-options {:visible? (:show-advanced-options @state) [:& advanced-options {:visible? open?
:on-close toggle-advanced-options} :on-close toggle-advanced-options}
[:button.custom-button {:class (when (:show-advanced-options @state) "is-active") [:button.custom-button {:on-click toggle-advanced-options} i/actions]
:on-click toggle-advanced-options} i/actions]
(when (= :square type) (when (= :square type)
[:& input-row {:label (t locale "workspace.options.grid.params.size") [:& input-row {:label (t locale "workspace.options.grid.params.size")
:class "pixels" :class "pixels"

3
frontend/src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs
View file

@ -98,8 +98,7 @@
(fn [] (fn []
(st/emit! (dch/update-shapes ids #(update-in % [:shadow index :hidden] not)))))] (st/emit! (dch/update-shapes ids #(update-in % [:shadow index :hidden] not)))))]
[:* [:*
[:div.element-set-options-group [:div.element-set-options-group {:style {:display (when @open-shadow "none")}}
[:div.element-set-actions-button [:div.element-set-actions-button
{:on-click #(reset! open-shadow true)} {:on-click #(reset! open-shadow true)}
i/actions] i/actions]

3
frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
View file

@ -468,7 +468,8 @@
[:* [:*
[:div.element-set-options-group.typography-entry [:div.element-set-options-group.typography-entry
{:class (when selected? "selected")} {:class (when selected? "selected")
:style {:display (when @open? "none")}}
[:div.typography-selection-wrapper [:div.typography-selection-wrapper
{:class (when on-click "is-selectable") {:class (when on-click "is-selectable")
:on-click on-click :on-click on-click