Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-12 07:41:43 -05:00
Code Issues Activity

Merge branch 'feature-grid' into develop

Browse source
This commit is contained in:
Andrey Antukh 2023-11-21 20:24:56 +01:00
commit 01a887c68c
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
frontend/src/app/main/ui/auth.cljs
View file

@ -11,6 +11,7 @@
[app.main.ui.auth.recovery :refer [recovery-page]] [app.main.ui.auth.recovery :refer [recovery-page]]
[app.main.ui.auth.recovery-request :refer [recovery-request-page]] [app.main.ui.auth.recovery-request :refer [recovery-request-page]]
[app.main.ui.auth.register :refer [register-page register-success-page register-validate-page]] [app.main.ui.auth.register :refer [register-page register-success-page register-validate-page]]
[app.main.ui.context :as ctx]
[app.main.ui.icons :as i] [app.main.ui.icons :as i]
[app.util.dom :as dom] [app.util.dom :as dom]
[app.util.i18n :as i18n :refer [tr]] [app.util.i18n :as i18n :refer [tr]]
@ -41,32 +42,34 @@
(mf/use-effect (mf/use-effect
#(dom/set-html-title (tr "title.default"))) #(dom/set-html-title (tr "title.default")))
[:main.auth ;; FIXME: Temporary disabled new css system until we redesign the login with the new styles
[:section.auth-sidebar [:& (mf/provider ctx/new-css-system) {:value false}
[:a.logo {:href "#/"} [:main.auth
[:span {:aria-hidden true} i/logo] [:section.auth-sidebar
[:span.hidden-name "Home"]] [:a.logo {:href "#/"}
[:span.tagline (tr "auth.sidebar-tagline")]] [:span {:aria-hidden true} i/logo]
[:span.hidden-name "Home"]]
[:span.tagline (tr "auth.sidebar-tagline")]]
[:section.auth-content [:section.auth-content
(case section (case section
:auth-register :auth-register
[:& register-page {:params params}] [:& register-page {:params params}]
:auth-register-validate :auth-register-validate
[:& register-validate-page {:params params}] [:& register-validate-page {:params params}]
:auth-register-success :auth-register-success
[:& register-success-page {:params params}] [:& register-success-page {:params params}]
:auth-login :auth-login
[:& login-page {:params params}] [:& login-page {:params params}]
:auth-recovery-request :auth-recovery-request
[:& recovery-request-page] [:& recovery-request-page]
:auth-recovery :auth-recovery
[:& recovery-page {:params params}]) [:& recovery-page {:params params}])
[:& terms-login {}]]])) [:& terms-login {}]]]]))

4
frontend/src/app/main/ui/workspace/colorpicker/libraries.scss
View file

@ -33,4 +33,8 @@
content: ""; content: "";
flex: auto; flex: auto;
} }
.select-wrapper {
overflow: initial;
}
} }