From ac10166f9849abbc8cf0aa512419bf5a2e76b402 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 25 Feb 2019 16:28:36 +0200 Subject: [PATCH] Remove unneeded backgrounds in intro-login stack --- .../ui/components/status_bar/styles.cljs | 3 +-- .../ui/components/toolbar/styles.cljs | 21 ++++++++++--------- .../ui/screens/accounts/create/styles.cljs | 5 ++--- .../ui/screens/accounts/recover/styles.cljs | 3 +-- src/status_im/ui/screens/accounts/styles.cljs | 3 +-- src/status_im/ui/screens/intro/styles.cljs | 3 +-- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/status_im/ui/components/status_bar/styles.cljs b/src/status_im/ui/components/status_bar/styles.cljs index 727a23b7f9..978b4ffc40 100644 --- a/src/status_im/ui/components/status_bar/styles.cljs +++ b/src/status_im/ui/components/status_bar/styles.cljs @@ -116,5 +116,4 @@ :bar-style "dark-content"})}) (defstyle view-default - (create-view-style {:background-color colors/white - :elevation elevation})) + (create-view-style {})) diff --git a/src/status_im/ui/components/toolbar/styles.cljs b/src/status_im/ui/components/toolbar/styles.cljs index b7404d5d34..a53e713341 100644 --- a/src/status_im/ui/components/toolbar/styles.cljs +++ b/src/status_im/ui/components/toolbar/styles.cljs @@ -2,22 +2,23 @@ (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) (:require [status-im.ui.components.colors :as colors])) -(def toolbar-background colors/white) - (def toolbar-height 56) (def toolbar-icon-width 24) (def toolbar-icon-height 24) (def toolbar-icon-spacing 24) (defnstyle toolbar [background-color flat?] - {:flex 0 - :flex-direction :row - :align-items :center - :justify-content :space-between - :background-color (or background-color toolbar-background) - :elevation (if flat? 0 2) - :android {:height 55} - :ios {:height 56}}) + (cond-> + {:flex 0 + :flex-direction :row + :align-items :center + :justify-content :space-between + :elevation (if flat? 0 2) + :android {:height 55} + :ios {:height 56}} + + background-color + (assoc :background-color background-color))) (def toolbar-nav-actions-container {:flex-direction :row diff --git a/src/status_im/ui/screens/accounts/create/styles.cljs b/src/status_im/ui/screens/accounts/create/styles.cljs index dbd1cb88ec..df57564841 100644 --- a/src/status_im/ui/screens/accounts/create/styles.cljs +++ b/src/status_im/ui/screens/accounts/create/styles.cljs @@ -3,8 +3,7 @@ (:require [status-im.ui.components.colors :as colors])) (def create-account-view - {:flex 1 - :background-color colors/white}) + {:flex 1}) (def account-creating-view {:flex 1 @@ -58,4 +57,4 @@ (def bottom-container {:flex-direction :row :margin-horizontal 12 - :margin-vertical 15}) \ No newline at end of file + :margin-vertical 15}) diff --git a/src/status_im/ui/screens/accounts/recover/styles.cljs b/src/status_im/ui/screens/accounts/recover/styles.cljs index c352cbcc27..853a343cea 100644 --- a/src/status_im/ui/screens/accounts/recover/styles.cljs +++ b/src/status_im/ui/screens/accounts/recover/styles.cljs @@ -3,8 +3,7 @@ (:require [status-im.ui.components.colors :as colors])) (def screen-container - {:flex 1 - :background-color colors/white}) + {:flex 1}) (defstyle inputs-container {:margin 16 diff --git a/src/status_im/ui/screens/accounts/styles.cljs b/src/status_im/ui/screens/accounts/styles.cljs index 45fe8ba030..f64c9842a2 100644 --- a/src/status_im/ui/screens/accounts/styles.cljs +++ b/src/status_im/ui/screens/accounts/styles.cljs @@ -4,8 +4,7 @@ [status-im.ui.components.colors :as colors])) (def accounts-view - {:flex 1 - :background-color colors/white}) + {:flex 1}) (def accounts-container {:flex 1 diff --git a/src/status_im/ui/screens/intro/styles.cljs b/src/status_im/ui/screens/intro/styles.cljs index 366221e0de..5f5de1fe73 100644 --- a/src/status_im/ui/screens/intro/styles.cljs +++ b/src/status_im/ui/screens/intro/styles.cljs @@ -4,8 +4,7 @@ (def intro-view {:flex 1 - :padding-horizontal 30 - :background-color colors/white}) + :padding-horizontal 30}) (def intro-logo-container {:flex 1