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

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2024-05-31 10:08:21 +02:00
commit 3c3ef57da2
9 changed files with 195 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/resources/styles/common/refactor/basic-rules.scss
View file

@ -593,6 +593,9 @@
width: 100%; width: 100%;
z-index: $z-index-modal; z-index: $z-index-modal;
background-color: var(--overlay-color); background-color: var(--overlay-color);
&.onboarding-a-b-test {
background-color: var(--overlay-color-onboarding-a-b-test);
}
} }
.modal-container-base { .modal-container-base {

2
frontend/resources/styles/common/refactor/color-defs.scss
View file

@ -11,6 +11,7 @@
// Dark background // Dark background
--db-primary: #18181a; --db-primary: #18181a;
--db-primary-60: #{color.change(#18181a, $alpha: 0.6)}; --db-primary-60: #{color.change(#18181a, $alpha: 0.6)};
--db-primary-90: #{color.change(#18181a, $alpha: 0.9)};
--db-secondary: #000000; --db-secondary: #000000;
--db-secondary-30: #{color.change(#000000, $alpha: 0.3)}; --db-secondary-30: #{color.change(#000000, $alpha: 0.3)};
--db-secondary-80: #{color.change(#000000, $alpha: 0.8)}; --db-secondary-80: #{color.change(#000000, $alpha: 0.8)};
@ -35,6 +36,7 @@
// Light background // Light background
--lb-primary: #ffffff; --lb-primary: #ffffff;
--lb-primary-60: #{color.change(#ffffff, $alpha: 0.6)}; --lb-primary-60: #{color.change(#ffffff, $alpha: 0.6)};
--lb-primary-90: #{color.change(#ffffff, $alpha: 0.9)};
--lb-secondary: #e8eaee; --lb-secondary: #e8eaee;
--lb-secondary-30: #{color.change(#e8eaee, $alpha: 0.3)}; --lb-secondary-30: #{color.change(#e8eaee, $alpha: 0.3)};
--lb-secondary-80: #{color.change(#e8eaee, $alpha: 0.8)}; --lb-secondary-80: #{color.change(#e8eaee, $alpha: 0.8)};

1
frontend/resources/styles/common/refactor/themes/default-theme.scss
View file

@ -37,6 +37,7 @@
--color-info-foreground: var(--status-color-info-500); --color-info-foreground: var(--status-color-info-500);
--overlay-color: var(--db-primary-60); --overlay-color: var(--db-primary-60);
--overlay-color-onboarding-a-b-test: var(--db-primary-90);
--shadow-color: var(--db-secondary-30); --shadow-color: var(--db-secondary-30);
--radio-button-box-shadow: 0 0 0 1px var(--db-secondary-30) inset; --radio-button-box-shadow: 0 0 0 1px var(--db-secondary-30) inset;

2
frontend/resources/styles/common/refactor/themes/light-theme.scss
View file

@ -37,6 +37,8 @@
--color-info-foreground: var(--status-color-info-500); --color-info-foreground: var(--status-color-info-500);
--overlay-color: var(--lb-primary-60); --overlay-color: var(--lb-primary-60);
--overlay-color-onboarding-a-b-test: var(--lb-primary-90);
--shadow-color: var(--lf-secondary-40); --shadow-color: var(--lf-secondary-40);
--radio-button-box-shadow: 0 0 0 1px var(--lb-secondary) inset; --radio-button-box-shadow: 0 0 0 1px var(--lb-secondary) inset;

8
frontend/src/app/main/ui/onboarding.cljs
View file

@ -142,7 +142,9 @@
(modal/show! {:type :onboarding-newsletter}) (modal/show! {:type :onboarding-newsletter})
(contains? cf/flags :onboarding-team) (contains? cf/flags :onboarding-team)
(modal/show! {:type :onboarding-team}))))] (modal/show! {:type :onboarding-team}))))
onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]
(mf/with-effect [@slide] (mf/with-effect [@slide]
(when (not= :start @slide) (when (not= :start @slide)
@ -151,8 +153,8 @@
(fn [] (fn []
(reset! klass nil) (reset! klass nil)
(tm/dispose! sem)))) (tm/dispose! sem))))
[:div {:class (stl/css-case :modal-overlay true
[:div {:class (stl/css :modal-overlay)} :onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated {:class (dm/str @klass " " (stl/css :animated))} [:div.animated {:class (dm/str @klass " " (stl/css :animated))}
(case @slide (case @slide
:start [:& onboarding-welcome {:next #(navigate :opensource)}] :start [:& onboarding-welcome {:next #(navigate :opensource)}]

7
frontend/src/app/main/ui/onboarding/newsletter.cljs
View file

@ -7,6 +7,7 @@
(ns app.main.ui.onboarding.newsletter (ns app.main.ui.onboarding.newsletter
(:require-macros [app.main.style :as stl]) (:require-macros [app.main.style :as stl])
(:require (:require
[app.config :as cf]
[app.main.data.messages :as msg] [app.main.data.messages :as msg]
[app.main.data.modal :as modal] [app.main.data.modal :as modal]
[app.main.data.users :as du] [app.main.data.users :as du]
@ -35,9 +36,11 @@
(st/emit! (when (or @newsletter-updates @newsletter-news) (st/emit! (when (or @newsletter-updates @newsletter-news)
(msg/success message)) (msg/success message))
(modal/show {:type :onboarding-team}) (modal/show {:type :onboarding-team})
(du/update-profile-props {:newsletter-updates @newsletter-updates :newsletter-news @newsletter-news}))))] (du/update-profile-props {:newsletter-updates @newsletter-updates :newsletter-news @newsletter-news}))))
onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated.fadeInDown {:class (stl/css :modal-container)} [:div.animated.fadeInDown {:class (stl/css :modal-container)}
[:div {:class (stl/css :modal-left)} [:div {:class (stl/css :modal-left)}
[:img {:src "images/deco-newsletter.png" [:img {:src "images/deco-newsletter.png"

6
frontend/src/app/main/ui/onboarding/questions.cljs
View file

@ -287,9 +287,11 @@
(modal/show! {:type :onboarding-team}) (modal/show! {:type :onboarding-team})
:else :else
(modal/hide!)))))] (modal/hide!)))))
onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div {:class (stl/css :modal-container) [:div {:class (stl/css :modal-container)
:ref container} :ref container}
(case @step (case @step

13
frontend/src/app/main/ui/onboarding/team_choice.cljs
View file

@ -9,6 +9,7 @@
(:require (:require
[app.common.data.macros :as dmc] [app.common.data.macros :as dmc]
[app.common.spec :as us] [app.common.spec :as us]
[app.config :as cf]
[app.main.data.dashboard :as dd] [app.main.data.dashboard :as dd]
[app.main.data.events :as ev] [app.main.data.events :as ev]
[app.main.data.messages :as msg] [app.main.data.messages :as msg]
@ -84,14 +85,16 @@
::ev/origin "onboarding" ::ev/origin "onboarding"
:step 1})))) :step 1}))))
teams (mf/deref refs/teams)] teams (mf/deref refs/teams)
onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]
(mf/with-effect [teams] (mf/with-effect [teams]
(when (> (count teams) 1) (when (> (count teams) 1)
(st/emit! (modal/hide)))) (st/emit! (modal/hide))))
(when (< (count teams) 2) (when (< (count teams) 2)
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated.fadeIn {:class (stl/css :modal-container)} [:div.animated.fadeIn {:class (stl/css :modal-container)}
[:& team-modal-left] [:& team-modal-left]
[:div {:class (stl/css :separator)}] [:div {:class (stl/css :separator)}]
@ -212,9 +215,11 @@
(if (> (count emails) 0) (if (> (count emails) 0)
(on-invite-now form) (on-invite-now form)
(on-invite-later form)) (on-invite-later form))
(modal/hide!))))] (modal/hide!))))
onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated.fadeIn {:class (stl/css :modal-container)} [:div.animated.fadeIn {:class (stl/css :modal-container)}
[:& team-modal-left] [:& team-modal-left]

19
frontend/src/app/main/ui/releases/v2_0.cljs
View file

@ -8,16 +8,19 @@
(:require-macros [app.main.style :as stl]) (:require-macros [app.main.style :as stl])
(:require (:require
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.config :as cf]
[app.main.ui.releases.common :as c] [app.main.ui.releases.common :as c]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
;; TODO: Review all copies and alt text ;; TODO: Review all copies and alt text
(defmethod c/render-release-notes "2.0" (defmethod c/render-release-notes "2.0"
[{:keys [slide klass next finish navigate version]}] [{:keys [slide klass next finish navigate version]}]
(let [onboarding-a-b-test? (cf/external-feature-flag "signup-background" "test")]
(mf/html (mf/html
(case slide (case slide
:start :start
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated {:class klass} [:div.animated {:class klass}
[:div {:class (stl/css :modal-container)} [:div {:class (stl/css :modal-container)}
[:img {:src "images/features/2.0-intro-image.png" [:img {:src "images/features/2.0-intro-image.png"
@ -61,7 +64,8 @@
:on-click next} "Continue"]]]]]] :on-click next} "Continue"]]]]]]
0 0
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated {:class klass} [:div.animated {:class klass}
[:div {:class (stl/css :modal-container)} [:div {:class (stl/css :modal-container)}
[:img {:src "images/features/2.0-css-grid.gif" [:img {:src "images/features/2.0-css-grid.gif"
@ -101,7 +105,8 @@
:class (stl/css :next-btn)} "Continue"]]]]]] :class (stl/css :next-btn)} "Continue"]]]]]]
1 1
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated {:class klass} [:div.animated {:class klass}
[:div {:class (stl/css :modal-container)} [:div {:class (stl/css :modal-container)}
[:img {:src "images/features/2.0-new-ui.gif" [:img {:src "images/features/2.0-new-ui.gif"
@ -135,7 +140,8 @@
:class (stl/css :next-btn)} "Continue"]]]]]] :class (stl/css :next-btn)} "Continue"]]]]]]
2 2
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated {:class klass} [:div.animated {:class klass}
[:div {:class (stl/css :modal-container)} [:div {:class (stl/css :modal-container)}
[:img {:src "images/features/2.0-components.gif" [:img {:src "images/features/2.0-components.gif"
@ -170,7 +176,8 @@
:class (stl/css :next-btn)} "Continue"]]]]]] :class (stl/css :next-btn)} "Continue"]]]]]]
3 3
[:div {:class (stl/css :modal-overlay)} [:div {:class (stl/css-case :modal-overlay true
:onboarding-a-b-test onboarding-a-b-test?)}
[:div.animated {:class klass} [:div.animated {:class klass}
[:div {:class (stl/css :modal-container)} [:div {:class (stl/css :modal-container)}
[:img {:src "images/features/2.0-html.gif" [:img {:src "images/features/2.0-html.gif"
@ -199,5 +206,5 @@
:total 4}] :total 4}]
[:button {:on-click finish [:button {:on-click finish
:class (stl/css :next-btn)} "Let's go"]]]]]]))) :class (stl/css :next-btn)} "Let's go"]]]]]]))))