From 7d7594818cf35b1a5c637ccc54ce1763628d8770 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Fri, 11 Oct 2024 14:32:54 +0200 Subject: [PATCH 1/2] :bug: Fix Internal Error page: "go to your penpot" wrong design --- CHANGES.md | 1 + frontend/src/app/main/ui/static.cljs | 6 ++++-- frontend/src/app/main/ui/static.scss | 24 +++++++++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ee6227421..da1e694d7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,6 +36,7 @@ - Fix problem with precision on boolean calculation [Taiga #8482](https://tree.taiga.io/project/penpot/issue/8482) - Fix problem when translating multiple path points [Github #4459](https://github.com/penpot/penpot/issues/4459) - Fix problem on importing (and exporting) files with flows [Taiga #8914](https://tree.taiga.io/project/penpot/issue/8914) +- Fix Internal Error page: "go to your penpot" wrong design [Taiga #8922](https://tree.taiga.io/project/penpot/issue/8922) ## 2.2.1 diff --git a/frontend/src/app/main/ui/static.cljs b/frontend/src/app/main/ui/static.cljs index fcc17b55d..50a3141e8 100644 --- a/frontend/src/app/main/ui/static.cljs +++ b/frontend/src/app/main/ui/static.cljs @@ -20,6 +20,8 @@ [app.main.ui.auth.recovery-request :refer [recovery-request-page recovery-sent-page]] [app.main.ui.auth.register :as register] [app.main.ui.dashboard.sidebar :refer [sidebar]] + [app.main.ui.ds.foundations.assets.icon :refer [icon*]] + [app.main.ui.ds.foundations.assets.raw-svg :refer [raw-svg*]] [app.main.ui.icons :as i] [app.main.ui.viewer.header :as viewer.header] [app.util.dom :as dom] @@ -43,9 +45,9 @@ [:button {:class (stl/css :exception-header) :on-click on-nav-root} - i/logo-icon + [:> raw-svg* {:id "penpot-logo-icon" :class (stl/css :penpot-logo)}] (when profile-id - (str "< " (tr "not-found.no-permission.go-dashboard")))] + [:div {:class (stl/css :go-back-wrapper)} [:> icon* {:id "arrow" :class (stl/css :back-arrow)}] [:span (tr "not-found.no-permission.go-dashboard")]])] [:div {:class (stl/css :deco-before)} i/logo-error-screen] (when-not profile-id [:button {:class (stl/css :login-header) diff --git a/frontend/src/app/main/ui/static.scss b/frontend/src/app/main/ui/static.scss index 601bd780c..0a509f016 100644 --- a/frontend/src/app/main/ui/static.scss +++ b/frontend/src/app/main/ui/static.scss @@ -66,6 +66,7 @@ justify-content: flex-end; height: 100%; width: 25%; + padding-bottom: $s-28; &:first-child { text-align: right; @@ -82,12 +83,25 @@ cursor: pointer; display: flex; align-items: center; +} - svg { - fill: var(--color-foreground-primary); - width: $s-48; - height: auto; - } +.penpot-logo { + fill: var(--color-foreground-primary); + width: $s-48; + height: $s-48; +} + +.back-arrow { + transform: rotate(180deg); +} + +.go-back-wrapper { + display: flex; + justify-content: center; + align-items: center; + gap: $s-8; + margin-left: $s-12; + font-size: $fs-14; } .login-header { From eda6c6a4c3e9fafcce499c1bfecdfb51193dec59 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Fri, 11 Oct 2024 13:25:17 +0200 Subject: [PATCH 2/2] :bug: Fix "Done" button on toolbar on inspect mode should go to design mode --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/sidebar/options.cljs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index da1e694d7..94da9261a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -37,6 +37,7 @@ - Fix problem when translating multiple path points [Github #4459](https://github.com/penpot/penpot/issues/4459) - Fix problem on importing (and exporting) files with flows [Taiga #8914](https://tree.taiga.io/project/penpot/issue/8914) - Fix Internal Error page: "go to your penpot" wrong design [Taiga #8922](https://tree.taiga.io/project/penpot/issue/8922) +- Fix "Done" button on toolbar on inspect mode should go to design mode [Taiga #8933](https://tree.taiga.io/project/penpot/issue/8933) ## 2.2.1 diff --git a/frontend/src/app/main/ui/workspace/sidebar/options.cljs b/frontend/src/app/main/ui/workspace/sidebar/options.cljs index cc6cef0bc..abd2aaf7e 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options.cljs @@ -138,6 +138,8 @@ first-selected-shape (first selected-shapes) shape-parent-frame (cfh/get-frame objects (:frame-id first-selected-shape)) + options-mode (mf/deref refs/options-mode-global) + on-change-tab (fn [options-mode] (let [options-mode (keyword options-mode)] @@ -187,6 +189,7 @@ [:> tab-switcher* {:tabs tabs :default-selected "info" :on-change-tab on-change-tab + :selected (name options-mode) :class (stl/css :options-tab-switcher)}]])) ;; TODO: this need optimizations, selected-objects and