diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs index 6621aedfce..42f8c39ca2 100644 --- a/src/status_im/chats_list/styles.cljs +++ b/src/status_im/chats_list/styles.cljs @@ -1,12 +1,12 @@ (ns status-im.chats-list.styles (:require [status-im.components.styles :refer [font - title-font - color-white - color-blue - online-color - text1-color - text2-color - new-messages-count-color]] + title-font + color-white + color-blue + online-color + text1-color + text2-color + new-messages-count-color]] [status-im.components.tabs.styles :refer [tabs-height]])) (def chat-container @@ -116,9 +116,10 @@ :color :white}) (defn action-buttons-container [animation? offset-y] - {:position :absolute - :left 0 - :right 0 - :top 0 - :bottom 0 - :transform [{:translateY (if animation? offset-y 1)}]}) + ;; todo fix overlaying of parent view + {:position :absolute + :right 0 + :height 230 + :width 80 + :bottom 0 + :transform [{:translateY (if animation? offset-y 1)}]}) diff --git a/src/status_im/components/main_tabs.cljs b/src/status_im/components/main_tabs.cljs index d59b1d676b..c12b746898 100644 --- a/src/status_im/components/main_tabs.cljs +++ b/src/status_im/components/main_tabs.cljs @@ -103,9 +103,8 @@ [view-id [:get :view-id] tab-animation? [:get :prev-tab-view-id]] [drawer-view - [view {:style common-st/flex} - [view {:style common-st/flex - :pointerEvents (if tab-animation? :none :auto)} - (doall (map #(tab-view %) tab-list))] + [view {:style common-st/flex + :pointerEvents (if tab-animation? :none :auto)} + (doall (map #(tab-view %) tab-list)) [tabs {:selected-view-id view-id :tab-list tab-list}]]]) diff --git a/src/status_im/components/tabs/styles.cljs b/src/status_im/components/tabs/styles.cljs index 2d873e88cd..4425c6349d 100644 --- a/src/status_im/components/tabs/styles.cljs +++ b/src/status_im/components/tabs/styles.cljs @@ -14,7 +14,11 @@ (def tab-height 56) (defn tabs-container [hidden? animation? offset-y] - {:height tabs-height + {:position :absolute + :bottom 0 + :left 0 + :right 0 + :height tabs-height :backgroundColor color-white :marginBottom (if (or hidden? animation?) (- tabs-height) 0) @@ -55,9 +59,10 @@ :alignItems :center}) (defn tab-view-container [offset-x] - {:position :absolute - :top 0 - :left 0 - :right 0 - :bottom 0 - :transform [{:translateX offset-x}]}) + {:position :absolute + :top 0 + :left 0 + :right 0 + :bottom 0 + :padding-bottom 59 + :transform [{:translateX offset-x}]}) diff --git a/src/status_im/contacts/screen.cljs b/src/status_im/contacts/screen.cljs index 97342f9f01..ef0d54464d 100644 --- a/src/status_im/contacts/screen.cljs +++ b/src/status_im/contacts/screen.cljs @@ -88,12 +88,13 @@ [view st/empty-contact-groups [react/icon :group_big st/empty-contacts-icon] [text {:style st/empty-contacts-text} (label :t/no-contacts)]]) - [action-button {:buttonColor color-blue - :offsetY 16 - :offsetX 16} - [action-button-item - {:title (label :t/new-contact) - :buttonColor :#9b59b6 - :onPress #(dispatch [:navigate-to :new-contact])} - [icon {:name :android-create - :style create-icon}]]]]))) + [view st/buttons-container + [action-button {:buttonColor color-blue + :offsetY 16 + :offsetX 16} + [action-button-item + {:title (label :t/new-contact) + :buttonColor :#9b59b6 + :onPress #(dispatch [:navigate-to :new-contact])} + [icon {:name :android-create + :style create-icon}]]]]]))) diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs index 64cb693300..dedf4e8c40 100644 --- a/src/status_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -180,3 +180,10 @@ (def address-explication {:textAlign :center :color "#838c93de"}) + +(def buttons-container + {:position :absolute + :bottom 0 + :right 0 + :width 200 + :height 170})