Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-19 11:11:21 -05:00
Code Issues Activity

Merge pull request #237 from uxbox/bug-fixing

Browse source 
Bug fixing
This commit is contained in:
Hirunatan 2020-06-03 10:22:40 +02:00 • committed by GitHub
commit e1ae3da41e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/resources/styles/common/base.scss
View file

@ -221,3 +221,7 @@ input[type=number]::-webkit-inner-spin-button,
-webkit-appearance: none;
margin: 0;
}
input[type=number] {
-moz-appearance: textfield;
}

1
frontend/resources/styles/main/layouts/main-layout.scss
View file

@ -21,6 +21,7 @@
& .library-bar {
grid-row: 2;
grid-column: 1 / span 2;
overflow: hidden;
}
& .dashboard-content {

20
frontend/resources/styles/main/partials/library-bar.scss
View file

@ -8,11 +8,20 @@
.library-bar {
background-color: $color-white;
.sidebar-team {
display: flex;
flex-direction: column;
padding: $size-4 0;
border-top: 1px solid $color-gray-10;
height: 100%;
padding-bottom: 2.8rem;
}
.library-bar-inside {
border-right: 1px solid $color-gray-10;
display: flex;
flex-direction: column;
height: 100%;
border-right: 1px solid $color-gray-10;
.library-tabs {
align-items: center;
@ -47,13 +56,14 @@
}
.library-elements {
border-top: 1px solid $color-gray-10;
display: flex;
flex-direction: column;
height: calc(95% - 1rem);
margin-bottom: $size-4;
overflow-y: auto;
padding: $size-4 0;
margin: 0;
&.library-common {
overflow: unset;
}
li {
align-items: center;

4
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -1020,7 +1020,8 @@
ptk/UpdateEvent
(update [_ state]
(let [mdata {:position position
:shape shape}]
:shape shape
:selected (get-in state [:workspace-local :selected])}]
(-> state
(assoc-in [:workspace-local :context-menu] mdata))))
@ -1328,6 +1329,7 @@
"ctrl+shift+z" #(st/emit! dwc/redo)
"ctrl+y" #(st/emit! dwc/redo)
"ctrl+q" #(st/emit! dwc/reinitialize-undo)
"a" #(st/emit! (select-for-drawing :frame))
"b" #(st/emit! (select-for-drawing :rect))
"e" #(st/emit! (select-for-drawing :circle))
"t" #(st/emit! (select-for-drawing :text))

47
frontend/src/uxbox/main/ui/dashboard/sidebar.cljs
View file

@ -96,36 +96,39 @@
library? (and (str/starts-with? (name selected-section) "dashboard-library")
(= selected-team-id (:default-team-id profile)))
locale (i18n/use-locale)]
[:ul.library-elements
[:li.recent-projects
{:on-click #(st/emit! (rt/nav :dashboard-team {:team-id team-id}))
:class-name (when home? "current")}
i/recent
[:span.element-title (t locale "dashboard.sidebar.recent")]]
[:div.sidebar-team
[:ul.library-elements.library-common
[:li.recent-projects
{:on-click #(st/emit! (rt/nav :dashboard-team {:team-id team-id}))
:class-name (when home? "current")}
i/recent
[:span.element-title (t locale "dashboard.sidebar.recent")]]
[:li
{:on-click #(st/emit! (rt/nav :dashboard-project {:team-id team-id
:project-id "drafts"}))
:class-name (when drafts? "current")}
i/file-html
[:span.element-title (t locale "dashboard.sidebar.drafts")]]
[:li
{:on-click #(st/emit! (rt/nav :dashboard-project {:team-id team-id
:project-id "drafts"}))
:class-name (when drafts? "current")}
i/file-html
[:span.element-title (t locale "dashboard.sidebar.drafts")]]
[:li
{:on-click #(st/emit! (rt/nav :dashboard-library-icons-index {:team-id team-id}))
:class-name (when library? "current")}
i/icon-set
[:span.element-title (t locale "dashboard.sidebar.libraries")]]
[:li
{:on-click #(st/emit! (rt/nav :dashboard-library-icons-index {:team-id team-id}))
:class-name (when library? "current")}
i/icon-set
[:span.element-title (t locale "dashboard.sidebar.libraries")]]]
[:div.projects-row
[:span "PROJECTS"]
[:a.btn-icon-light.btn-small {:on-click #(st/emit! dsh/create-project)}
i/close]]
[:& sidebar-projects
{:selected-team-id selected-team-id
:selected-project-id selected-project-id
:team-id team-id}]]))
[:ul.library-elements
[:& sidebar-projects
{:selected-team-id selected-team-id
:selected-project-id selected-project-id
:team-id team-id}]]]
))
(def debounced-emit! (f/debounce st/emit! 500))

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

@ -90,7 +90,7 @@
:shortcut "g"
:on-click do-create-group}])
(when (and (= (count selected)) (= (:type shape) :group))
(when (and (= (count selected) 1) (= (:type shape) :group))
[:& menu-entry {:title "Ungroup"
:shortcut "Shift + g"
:on-click do-remove-group}])

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

@ -125,7 +125,7 @@
(:hidden item))
nil
(.-ctrlKey event)
(.-shiftKey event)
(st/emit! (dw/select-shape id true))
(> (count selected) 1)

1
frontend/src/uxbox/main/ui/workspace/viewport.cljs
View file

@ -311,6 +311,7 @@
on-drop
(fn [event]
(dom/prevent-default event)
(let [shape (dom/get-data-transfer event)
point (gpt/point (.-clientX event) (.-clientY event))
viewport-coord (translate-point-to-viewport point)

4
frontend/src/uxbox/util/dom.cljs
View file

@ -165,11 +165,11 @@
(defn set-data-transfer
[event data]
(let [data-string (ts/encode data)]
(-> event .-dataTransfer (.setData "text" data-string))))
(-> event .-dataTransfer (.setData "text/plain" data-string))))
(defn get-data-transfer
[event]
(let [data-string (-> event .-dataTransfer (.getData "text"))]
(let [data-string (-> event .-dataTransfer (.getData "text/plain"))]
(ts/decode data-string)))
(defn fullscreen?