From 45c35733be4f1c4c09d7d563f84d62020729287a Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Mon, 23 May 2016 13:13:06 +0300 Subject: [PATCH] small code clean --- src/status_im/chats_list/styles.cljs | 5 ++- src/status_im/contacts/styles.cljs | 5 ++- src/status_im/discovery/styles.cljs | 67 ++++++++++++++-------------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/status_im/chats_list/styles.cljs b/src/status_im/chats_list/styles.cljs index 26684a82b3..592a882d3e 100644 --- a/src/status_im/chats_list/styles.cljs +++ b/src/status_im/chats_list/styles.cljs @@ -6,7 +6,8 @@ online-color text1-color text2-color - new-messages-count-color]])) + new-messages-count-color]] + [status-im.components.tabs.styles :refer [tab-height]])) (def contact-photo-container {:borderRadius 50}) @@ -135,7 +136,7 @@ (def list-container {:backgroundColor :white - :marginBottom 56}) + :marginBottom tab-height}) (def create-icon {:fontSize 20 diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs index 0629575db3..7455363d38 100644 --- a/src/status_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -3,7 +3,8 @@ title-font text1-color color-white - online-color]])) + online-color]] + [status-im.components.tabs.styles :refer [tab-height]])) (def search-icon {:width 17 @@ -15,7 +16,7 @@ (def contacts-list {:backgroundColor :white - :marginBottom 56}) + :marginBottom tab-height}) (def contact-photo-container {:borderRadius 50}) diff --git a/src/status_im/discovery/styles.cljs b/src/status_im/discovery/styles.cljs index beb1209498..979cd287a0 100644 --- a/src/status_im/discovery/styles.cljs +++ b/src/status_im/discovery/styles.cljs @@ -1,14 +1,15 @@ (ns status-im.discovery.styles (:require [status-im.components.styles :refer [font - title-font - color-white - chat-background - online-color - selected-message-color - separator-color - text1-color - text2-color - toolbar-background1]])) + title-font + color-white + chat-background + online-color + selected-message-color + separator-color + text1-color + text2-color + toolbar-background1]] + [status-im.components.tabs.styles :refer [tab-height]])) ;; common @@ -39,7 +40,7 @@ (def discovery-title {:color "#000000de" - :alignSelf :center + :alignSelf :center :textAlign :center :fontFamily "sans-serif" :fontSize 16}) @@ -59,7 +60,7 @@ :paddingBottom 15}) (def scroll-view-container - {:marginBottom 56}) + {:marginBottom tab-height}) ;; discovery_popular.cljs @@ -74,12 +75,12 @@ ;; discovery_populat_list.cljs (def tag-name - {:color "#7099e6" - :fontFamily "sans-serif-medium" - :fontSize 14 - :paddingRight 5 - :paddingBottom 2 - :alignItems :center + {:color "#7099e6" + :fontFamily "sans-serif-medium" + :fontSize 14 + :paddingRight 5 + :paddingBottom 2 + :alignItems :center :justifyContent :center}) (def tag-name-container @@ -89,12 +90,12 @@ :padding 4}) (def tag-count - {:color "#838c93" - :fontFamily "sans-serif" - :fontSize 12 - :paddingRight 5 - :paddingBottom 2 - :alignItems :center + {:color "#838c93" + :fontFamily "sans-serif" + :fontSize 12 + :paddingRight 5 + :paddingBottom 2 + :alignItems :center :justifyContent :center}) (def tag-count-container @@ -105,20 +106,20 @@ :paddingRight 9}) (def popular-list-container - {:flex 1 + {:flex 1 :backgroundColor :white - :paddingLeft 10 - :paddingTop 16}) + :paddingLeft 10 + :paddingTop 16}) (def popular-list {:backgroundColor :white - :paddingTop 13}) + :paddingTop 13}) ;; discover_popular_list_item.cjls (def popular-list-item {:flexDirection :row - :paddingTop 10 + :paddingTop 10 :paddingBottom 10}) (def popular-list-item-status @@ -140,8 +141,8 @@ (def popular-list-item-avatar-container {:flex 0.2 :flexDirection "column" - :alignItems :center - :paddingTop 5}) + :alignItems :center + :paddingTop 5}) (def popular-list-item-avatar {:resizeMode "contain" @@ -153,7 +154,7 @@ (def recent-list {:backgroundColor :white - :paddingLeft 15}) + :paddingLeft 15}) ;; discovery_tag @@ -162,8 +163,8 @@ :backgroundColor "#eef2f5"}) (def tag-title-container - {:flex 1 - :alignItems "center" + {:flex 1 + :alignItems "center" :justifyContent "center"}) (def tag-title