From a47998a7a012e5100bc0d9af7a4378a92c260da5 Mon Sep 17 00:00:00 2001 From: BalogunofAfrica <45393944+BalogunofAfrica@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:55:11 +0100 Subject: [PATCH] fix: resolve activity centre design feedback (#17105) --- .../notifications/activity_log/style.cljs | 13 +++++++------ .../components/notifications/activity_log/view.cljs | 6 +++++- src/quo2/components/selectors/filter/style.cljs | 2 +- src/quo2/components/tags/status_tags.cljs | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/quo2/components/notifications/activity_log/style.cljs b/src/quo2/components/notifications/activity_log/style.cljs index a987f7f089..6668eb6053 100644 --- a/src/quo2/components/notifications/activity_log/style.cljs +++ b/src/quo2/components/notifications/activity_log/style.cljs @@ -28,7 +28,7 @@ (defn message-container [attachment] {:border-radius 12 - :margin-top 12 + :margin-top 10 :padding-horizontal 12 :padding-vertical (if (#{:photo :gif} attachment) 12 8) :background-color colors/white-opa-5}) @@ -39,11 +39,14 @@ (defn title [] - {:color colors/white}) + {:flex-shrink 1 + :color colors/white}) (def timestamp {:text-transform :none :margin-left 8 + :margin-top 4 + :flex-shrink 0 :color colors/neutral-40}) (defn unread-dot @@ -65,10 +68,8 @@ :flex-wrap :wrap}) (def top-section-container - {:align-items :center - :flex-direction :row}) + {:flex-direction :row}) (def title-container {:flex 1 - :flex-direction :row - :align-items :center}) + :flex-direction :row}) diff --git a/src/quo2/components/notifications/activity_log/view.cljs b/src/quo2/components/notifications/activity_log/view.cljs index d5f32dbd74..c0a333724c 100644 --- a/src/quo2/components/notifications/activity_log/view.cljs +++ b/src/quo2/components/notifications/activity_log/view.cljs @@ -52,7 +52,7 @@ (defn- activity-context [context replying?] (let [first-line-offset (if replying? 4 0) - gap-between-lines 4] + gap-between-lines 5] (into [rn/view {:style (assoc style/context-container :margin-top first-line-offset)}] (mapcat (fn [detail] @@ -130,6 +130,10 @@ (assoc :size size) (assoc :type subtype) (assoc :disabled? (and replying? disable-when (disable-when @reply-input))) + (assoc :inner-style + {:justify-content :center + :padding-bottom 0 + :padding-top 0}) (update :container-style merge common-style {:margin-right 8})) label])) diff --git a/src/quo2/components/selectors/filter/style.cljs b/src/quo2/components/selectors/filter/style.cljs index 11c7455348..8fc3d2545f 100644 --- a/src/quo2/components/selectors/filter/style.cljs +++ b/src/quo2/components/selectors/filter/style.cljs @@ -38,7 +38,7 @@ [customization-color pressed? theme] (when pressed? (if customization-color - (colors/custom-color-by-theme customization-color 50 60) + (colors/custom-color (or customization-color :blue) 60) (colors/theme-colors colors/primary-50 colors/primary-60 theme)))) (defn container-outer diff --git a/src/quo2/components/tags/status_tags.cljs b/src/quo2/components/tags/status_tags.cljs index 30c64bb743..00dedefdd5 100644 --- a/src/quo2/components/tags/status_tags.cljs +++ b/src/quo2/components/tags/status_tags.cljs @@ -13,7 +13,7 @@ (merge default-container-style {:min-height 24 :padding-horizontal 8 - :padding-vertical 1})) + :padding-vertical 3})) (def large-container-style (merge default-container-style