From 05886cc628b03dd9d8044cef2abc1ca44d4cceba Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Tue, 2 May 2017 15:52:28 +0300 Subject: [PATCH] fixes https://github.com/status-im/status-react/issues/1138 and https://github.com/status-im/status-react/issues/837 --- src/status_im/chat/styles/input/input.cljs | 5 ++++- src/status_im/chat/views/input/input.cljs | 2 +- src/status_im/chat/views/input/result_box.cljs | 4 +++- src/status_im/components/sync_state/styles.cljs | 8 +++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/status_im/chat/styles/input/input.cljs b/src/status_im/chat/styles/input/input.cljs index 628f610701..8ca2ff0329 100644 --- a/src/status_im/chat/styles/input/input.cljs +++ b/src/status_im/chat/styles/input/input.cljs @@ -1,5 +1,5 @@ (ns status-im.chat.styles.input.input - (:require-macros [status-im.utils.styles :refer [defnstyle]]) + (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) (:require [status-im.components.styles :as common] [status-im.utils.platform :as platform] [taoensso.timbre :as log])) @@ -31,6 +31,9 @@ :padding-top 8 :padding-bottom bottom-anim-margin}) +(defstyle input-container-view + {:ios {:z-index 1}}) + (def input-container {:flex-direction :row :align-items :flex-end}) diff --git a/src/status_im/chat/views/input/input.cljs b/src/status_im/chat/views/input/input.cljs index 0b551ffd32..b5a8e0e4bb 100644 --- a/src/status_im/chat/views/input/input.cljs +++ b/src/status_im/chat/views/input/input.cljs @@ -249,7 +249,7 @@ :reagent-render (fn [] - [view + [view style/input-container-view [parameter-box/parameter-box-view] [result-box/result-box-view] [suggestions/suggestions-view] diff --git a/src/status_im/chat/views/input/result_box.cljs b/src/status_im/chat/views/input/result_box.cljs index e7f8b8e19e..bce6975492 100644 --- a/src/status_im/chat/views/input/result_box.cljs +++ b/src/status_im/chat/views/input/result_box.cljs @@ -9,6 +9,7 @@ [status-im.chat.views.input.animations.expandable :refer [expandable-view]] [status-im.chat.styles.input.result-box :as style] [status-im.chat.views.input.utils :as input-utils] + [status-im.components.sync-state.offline :refer [offline-view]] [status-im.i18n :refer [label]] [taoensso.timbre :as log])) @@ -34,4 +35,5 @@ [expandable-view {:key :result-box :draggable? true :custom-header header} - [result-box-container markup]])) + [result-box-container markup] + [offline-view]])) diff --git a/src/status_im/components/sync_state/styles.cljs b/src/status_im/components/sync_state/styles.cljs index b6b036597d..16312b3dbe 100644 --- a/src/status_im/components/sync_state/styles.cljs +++ b/src/status_im/components/sync_state/styles.cljs @@ -1,4 +1,5 @@ -(ns status-im.components.sync-state.styles) +(ns status-im.components.sync-state.styles + (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])) (def sync-style-gradient {:position :relative @@ -26,8 +27,9 @@ :background-color "#5fc48d" :height 2}) -(defn offline-wrapper [top opacity window-width pending?] - {:opacity opacity +(defnstyle offline-wrapper [top opacity window-width pending?] + {:ios {:z-index 0} + :opacity opacity :width window-width :top (+ (+ 56 top) (if pending? 35 0)) :position :absolute