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

fixed :background-color on Android crash 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2019-09-06 10:35:57 +02:00
parent b18a044146
commit d07c9c6613
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
3 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/ui/components/button.cljs
View File

@ -20,13 +20,13 @@
:align-items :center :justify-content :center
:background-color (cond
(#{:secondary :next :previous} type)
nil
""
disabled?
colors/gray-transparent-10
(= type :main)
colors/blue-transparent-10
:else
nil)}))
"")}))
(defn button
@ -61,7 +61,7 @@
(#{:main :secondary :next :previous} type)
colors/blue
:else
nil)}}
"")}}
label]
(when (= type :next)
[vector-icons/icon :main-icons/next {:container-style {:width 24 :height 24 :margin-left 4}

1
src/status_im/ui/screens/wallet/components/styles.cljs
View File

@ -104,7 +104,6 @@
(defstyle container-disabled
{:border-width 1
:border-color colors/white-transparent-10
:background-color nil
:border-radius 8})
(def wallet-container

46
src/status_im/ui/screens/wallet/send/styles.cljs
View File

@ -7,26 +7,6 @@
{:flex 1
:padding-bottom 60})
(defn animated-sign-panel [bottom-value]
{:position :absolute
:left 12
:right 12
:bottom bottom-value})
(defn sign-panel [opacity-value]
{:opacity opacity-value
:border-radius 8
:background-color colors/white
:padding-top 12
:padding-horizontal 12})
(def signing-phrase-container
{:border-radius 8
:height 36
:align-items :center
:justify-content :center
:background-color colors/gray-lighter})
(def signing-phrase-description
{:padding-top 8})
@ -68,34 +48,10 @@
{:flex-direction :row
:margin 15})
(def transaction-fee-info-icon
{:border-radius 25
:width 25
:height 25
:margin-right 15
:align-items :center
:justify-content :center
:background-color colors/black-transparent})
(def transaction-fee-info-icon-text
{:color colors/white
:font-size 14})
(def transaction-fee-input
{:keyboard-type :numeric
:auto-capitalize "none"
:placeholder "0.000"
:placeholder-text-color colors/white-transparent
:selection-color colors/white
:style wallet.components.styles/text-input})
(def sign-buttons
{:background-color colors/blue
:padding-vertical 8})
(def password-error-tooltip
{:bottom-value 15
:color colors/red-light})
(defstyle gas-input-error-tooltip
{:android {:bottom-value -38}})
:style wallet.components.styles/text-input})