status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes https://github.com/status-im/status-react/issues/1138 and https://github.com/status-im/status-react/issues/837

This commit is contained in:
Andrey Shovkoplyas 2017-05-02 15:52:28 +03:00 committed by Roman Volosovskyi
parent 72d06426d8
commit 05886cc628
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/status_im/chat/styles/input/input.cljs
View File

@ -1,5 +1,5 @@
(ns status-im.chat.styles.input.input (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] (:require [status-im.components.styles :as common]
[status-im.utils.platform :as platform] [status-im.utils.platform :as platform]
[taoensso.timbre :as log])) [taoensso.timbre :as log]))
@ -31,6 +31,9 @@
:padding-top 8 :padding-top 8
:padding-bottom bottom-anim-margin}) :padding-bottom bottom-anim-margin})
(defstyle input-container-view
{:ios {:z-index 1}})
(def input-container (def input-container
{:flex-direction :row {:flex-direction :row
:align-items :flex-end}) :align-items :flex-end})

2
src/status_im/chat/views/input/input.cljs
View File

@ -249,7 +249,7 @@
:reagent-render :reagent-render
(fn [] (fn []
[view [view style/input-container-view
[parameter-box/parameter-box-view] [parameter-box/parameter-box-view]
[result-box/result-box-view] [result-box/result-box-view]
[suggestions/suggestions-view] [suggestions/suggestions-view]

4
src/status_im/chat/views/input/result_box.cljs
View File

@ -9,6 +9,7 @@
[status-im.chat.views.input.animations.expandable :refer [expandable-view]] [status-im.chat.views.input.animations.expandable :refer [expandable-view]]
[status-im.chat.styles.input.result-box :as style] [status-im.chat.styles.input.result-box :as style]
[status-im.chat.views.input.utils :as input-utils] [status-im.chat.views.input.utils :as input-utils]
[status-im.components.sync-state.offline :refer [offline-view]]
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
[taoensso.timbre :as log])) [taoensso.timbre :as log]))
@ -34,4 +35,5 @@
[expandable-view {:key :result-box [expandable-view {:key :result-box
:draggable? true :draggable? true
:custom-header header} :custom-header header}
[result-box-container markup]])) [result-box-container markup]
[offline-view]]))

8
src/status_im/components/sync_state/styles.cljs
View File

@ -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 (def sync-style-gradient
{:position :relative {:position :relative
@ -26,8 +27,9 @@
:background-color "#5fc48d" :background-color "#5fc48d"
:height 2}) :height 2})
(defn offline-wrapper [top opacity window-width pending?] (defnstyle offline-wrapper [top opacity window-width pending?]
{:opacity opacity {:ios {:z-index 0}
:opacity opacity
:width window-width :width window-width
:top (+ (+ 56 top) (if pending? 35 0)) :top (+ (+ 56 top) (if pending? 35 0))
:position :absolute :position :absolute