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

🐛 Fixes scroll in dashboard sidebar

Browse source
This commit is contained in:
alonso.torres 2020-06-03 08:25:28 +02:00
parent 7861c81538
commit 8077f2704e
3 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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