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

Refactor colors, remove unneeded (src/status_im) issue #278

This commit is contained in:
alealejandro 2017-01-25 09:20:37 -08:00 committed by Roman Volosovskyi
parent 58fd0c1134
commit 30fb48523e
31 changed files with 82 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -69,7 +69,7 @@ figwheel_server.log
out out
doo-index.html doo-index.html
# Re-natal # Re-natal
re-natal re-natal
# status-go # status-go

5
src/status_im/accounts/login/screen.cljs
View File

@ -13,11 +13,8 @@
[status-im.components.toolbar.styles :refer [toolbar-title-container [status-im.components.toolbar.styles :refer [toolbar-title-container
toolbar-title-text]] toolbar-title-text]]
[status-im.components.text-field.view :refer [text-field]] [status-im.components.text-field.view :refer [text-field]]
[status-im.components.styles :refer [color-purple [status-im.components.styles :refer [color-white
color-white
icon-search icon-search
icon-back
icon-qr
button-input]] button-input]]
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
[status-im.accounts.login.styles :as st])) [status-im.accounts.login.styles :as st]))

7
src/status_im/accounts/login/styles.cljs
View File

@ -1,5 +1,6 @@
(ns status-im.accounts.login.styles (ns status-im.accounts.login.styles
(:require [status-im.components.styles :refer [color-white]])) (:require [status-im.components.styles :refer [color-white
color-blue]]))
(defn screen-container [height] (defn screen-container [height]
@ -40,7 +41,7 @@
:paddingHorizontal 28}) :paddingHorizontal 28})
(def connect-button-text (def connect-button-text
{:color "#7099e6" {:color color-blue
:fontSize 16}) :fontSize 16})
(def input-style (def input-style
@ -51,4 +52,4 @@
{:color :white}) {:color :white})
(def address-input-wrapper (def address-input-wrapper
{}) {})

17
src/status_im/accounts/recover/screen.cljs
View File

@ -13,8 +13,9 @@
[status-im.components.toolbar.styles :refer [toolbar-gradient [status-im.components.toolbar.styles :refer [toolbar-gradient
toolbar-title-container toolbar-title-container
toolbar-title-text]] toolbar-title-text]]
[status-im.components.styles :refer [color-purple [status-im.components.styles :refer [color-blue
color-white color-gray
separator-color
button-input]] button-input]]
[status-im.components.react :refer [linear-gradient]] [status-im.components.react :refer [linear-gradient]]
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
@ -40,10 +41,10 @@
[text-field [text-field
{:value passphrase {:value passphrase
:error error :error error
:error-color "#7099e6" :error-color color-blue
:label (label :t/passphrase) :label (label :t/passphrase)
:label-color "#838c93de" :label-color color-gray
:line-color "#0000001f" :line-color separator-color
:input-style st/input-style :input-style st/input-style
:wrapper-style (merge button-input st/address-input-wrapper) :wrapper-style (merge button-input st/address-input-wrapper)
:on-change-text #(dispatch [:set-in [:recover :passphrase] %])}]])) :on-change-text #(dispatch [:set-in [:recover :passphrase] %])}]]))
@ -59,10 +60,10 @@
{:value password {:value password
:secure-text-entry true :secure-text-entry true
:error error :error error
:error-color "#7099e6" :error-color color-blue
:label (label :t/password) :label (label :t/password)
:label-color "#838c93de" :label-color color-gray
:line-color "#0000001f" :line-color separator-color
:input-style st/input-style :input-style st/input-style
:on-change-text #(dispatch [:set-in [:recover :password] %])}]])) :on-change-text #(dispatch [:set-in [:recover :password] %])}]]))

10
src/status_im/accounts/recover/styles.cljs
View File

@ -1,5 +1,7 @@
(ns status-im.accounts.recover.styles (ns status-im.accounts.recover.styles
(:require [status-im.components.styles :refer [color-white]])) (:require [status-im.components.styles :refer [color-white
color-gray
color-blue]]))
(def screen-container (def screen-container
@ -20,7 +22,7 @@
:justify-content :center}) :justify-content :center})
(def recover-explain-text (def recover-explain-text
{:color "#838c93de" {:color color-gray
:font-size 16 :font-size 16
:line-height 20 :line-height 20
:text-align :center}) :text-align :center})
@ -45,7 +47,7 @@
{:flex 1}) {:flex 1})
(defn recover-button [valid-form?] (defn recover-button [valid-form?]
{:backgroundColor (if valid-form? "#7099e6" :gray) {:backgroundColor (if valid-form? color-blue :gray)
:color :white :color :white
:flex 1 :flex 1
:alignItems :center :alignItems :center
@ -64,4 +66,4 @@
{:color :white}) {:color :white})
(def address-input-wrapper (def address-input-wrapper
{}) {})

5
src/status_im/accounts/screen.cljs
View File

@ -12,11 +12,8 @@
[status-im.components.status-bar :refer [status-bar]] [status-im.components.status-bar :refer [status-bar]]
[status-im.components.toolbar.view :refer [toolbar]] [status-im.components.toolbar.view :refer [toolbar]]
[status-im.components.toolbar.actions :as act] [status-im.components.toolbar.actions :as act]
[status-im.components.styles :refer [color-purple [status-im.components.styles :refer [color-white
color-white
icon-search icon-search
icon-back
icon-qr
icon-plus icon-plus
white-form-text-input]] white-form-text-input]]
[status-im.components.toolbar.styles :refer [toolbar-title-container [status-im.components.toolbar.styles :refer [toolbar-title-container

11
src/status_im/chat/styles/content_suggestions.cljs
View File

@ -1,15 +1,8 @@
(ns status-im.chat.styles.content-suggestions (ns status-im.chat.styles.content-suggestions
(:require [status-im.components.styles :refer [color-light-blue-transparent (:require [status-im.components.styles :refer [color-white
color-white
color-black
color-blue
color-blue-transparent
selected-message-color
online-color
separator-color separator-color
text1-color text1-color
text2-color text2-color]]))
text3-color]]))
(def suggestion-height 56) (def suggestion-height 56)

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

@ -1,10 +1,7 @@
(ns status-im.chat.styles.input (ns status-im.chat.styles.input
(:require [status-im.components.styles :refer [color-white (:require [status-im.components.styles :refer [color-white
color-blue color-blue
text1-color text1-color]]))
text2-color
chat-background
color-black]]))
(def command-input-and-suggestions-container (def command-input-and-suggestions-container
{:flexDirection :column}) {:flexDirection :column})

4
src/status_im/chat/styles/message.cljs
View File

@ -1,10 +1,8 @@
(ns status-im.chat.styles.message (ns status-im.chat.styles.message
(:require [status-im.components.styles :refer [color-light-blue-transparent (:require [status-im.components.styles :refer [color-white
color-white
color-black color-black
color-blue color-blue
selected-message-color selected-message-color
online-color
text1-color text1-color
text2-color]] text2-color]]
[status-im.constants :refer [text-content-type [status-im.constants :refer [text-content-type

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

@ -1,5 +1,6 @@
(ns status-im.chat.styles.plain-message (ns status-im.chat.styles.plain-message
(:require [status-im.components.styles :refer [text1-color]] (:require [status-im.components.styles :refer [text1-color
color-blue]]
[status-im.chat.constants :refer [max-input-height [status-im.chat.constants :refer [max-input-height
min-input-height]])) min-input-height]]))
@ -34,7 +35,7 @@
:position :absolute}) :position :absolute})
(def requests-icon (def requests-icon
{:background-color :#7099e6 {:background-color color-blue
:margin 2 :margin 2
:width 8 :width 8
:height 8 :height 8

6
src/status_im/chat/styles/response.cljs
View File

@ -1,10 +1,6 @@
(ns status-im.chat.styles.response (ns status-im.chat.styles.response
(:require [status-im.components.styles :refer [color-white (:require [status-im.components.styles :refer [color-white
color-blue text1-color]]
text1-color
text2-color
chat-background
color-black]]
[status-im.chat.constants :refer [input-height [status-im.chat.constants :refer [input-height
request-info-height request-info-height
response-height-normal]])) response-height-normal]]))

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

@ -1,8 +1,5 @@
(ns status-im.chat.styles.screen (ns status-im.chat.styles.screen
(:require [status-im.components.styles :refer [color-white (:require [status-im.components.styles :refer [chat-background
color-black
chat-background
online-color
selected-message-color selected-message-color
separator-color separator-color
text1-color text1-color

10
src/status_im/chat/styles/suggestions.cljs
View File

@ -1,16 +1,10 @@
(ns status-im.chat.styles.suggestions (ns status-im.chat.styles.suggestions
(:require [status-im.components.styles :refer [color-light-blue-transparent (:require [status-im.components.styles :refer [color-white
color-white
color-black color-black
color-gray color-gray
color-blue
color-blue-transparent
selected-message-color
online-color
separator-color separator-color
text1-color text1-color
text2-color text2-color]]))
text3-color]]))
(def suggestion-height 60) (def suggestion-height 60)

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

@ -18,7 +18,7 @@
:password {:input-options {:secure-text-entry true}} :password {:input-options {:secure-text-entry true}}
:number {:input-options {:keyboard-type "numeric"}} :number {:input-options {:keyboard-type "numeric"}}
;; todo maybe nil is fine for now :) ;; todo maybe nil is fine for now :)
nil #_(throw (js/Error. "Uknown command type")))] nil #_(throw (js/Error. "Unknown command type")))]
(if (= :response command-type) (if (= :response command-type)
(if placeholder (if placeholder
(assoc-in options [:input-options :placeholder] placeholder) (assoc-in options [:input-options :placeholder] placeholder)

9
src/status_im/components/drawer/styles.cljs
View File

@ -1,12 +1,5 @@
(ns status-im.components.drawer.styles (ns status-im.components.drawer.styles
(:require [status-im.components.styles :refer [color-light-blue-transparent (:require [status-im.components.styles :refer [color-white
color-white
color-black
color-blue
color-blue-transparent
selected-message-color
online-color
separator-color
text1-color text1-color
text2-color text2-color
text3-color text3-color

7
src/status_im/components/image_button/styles.cljs
View File

@ -1,4 +1,5 @@
(ns status-im.components.image-button.styles) (ns status-im.components.image-button.styles
(:require [status-im.components.styles :refer [color-blue]]))
(def image-button (def image-button
{:position :absolute {:position :absolute
@ -22,7 +23,7 @@
:margin-left 8}) :margin-left 8})
(def scan-button-text (def scan-button-text
(merge image-button-text {:color "#7099e6"})) (merge image-button-text {:color color-blue}))
(def show-qr-button-text (def show-qr-button-text
(merge image-button-text {:color "#838c93"})) (merge image-button-text {:color "#838c93"}))

6
src/status_im/components/selectable_field/styles.cljs
View File

@ -1,5 +1,6 @@
(ns status-im.components.selectable-field.styles (ns status-im.components.selectable-field.styles
(:require [status-im.utils.platform :refer [platform-specific]])) (:require [status-im.utils.platform :refer [platform-specific]]
[status-im.components.styles :refer [text1-disabled-color]]))
(def selectable-field-container (def selectable-field-container
@ -20,7 +21,7 @@
(def text (def text
{:font-size 16 {:font-size 16
:color "#555555" :color text1-disabled-color
:margin-right 16 :margin-right 16
:text-align-vertical :top}) :text-align-vertical :top})
@ -35,4 +36,3 @@
:padding-left 0 :padding-left 0
:margin-left 0 :margin-left 0
:padding-bottom 0}))) :padding-bottom 0})))

7
src/status_im/components/status_view/view.cljs
View File

@ -3,10 +3,11 @@
(:require [re-frame.core :refer [subscribe dispatch]] (:require [re-frame.core :refer [subscribe dispatch]]
[clojure.string :as str] [clojure.string :as str]
[status-im.components.react :refer [view text]] [status-im.components.react :refer [view text]]
[status-im.utils.platform :refer [platform-specific]])) [status-im.utils.platform :refer [platform-specific]]
[status-im.components.styles :refer [color-blue]]))
(defn tag-view [tag] (defn tag-view [tag]
[text {:style {:color "#7099e6"} [text {:style {:color color-blue}
:font :medium} :font :medium}
(str tag " ")]) (str tag " ")])
@ -25,4 +26,4 @@
^{:key (str "item-" message-id "-" i)} ^{:key (str "item-" message-id "-" i)}
[tag-view status] [tag-view status]
^{:key (str "item-" message-id "-" i)} ^{:key (str "item-" message-id "-" i)}
(str status " ")))]) (str status " ")))])

2
src/status_im/components/styles.cljs
View File

@ -19,8 +19,6 @@
(def text1-disabled-color "#555555") (def text1-disabled-color "#555555")
(def text2-color color-gray) (def text2-color color-gray)
(def text3-color color-blue) (def text3-color color-blue)
(def text4-color color-white)
(def text5-color "#838c938f")
(def online-color color-blue) (def online-color color-blue)
(def new-messages-count-color color-blue-transparent) (def new-messages-count-color color-blue-transparent)
(def chat-background color-light-gray) (def chat-background color-light-gray)

7
src/status_im/components/text_field/view.cljs
View File

@ -12,7 +12,8 @@
[status-im.components.text-field.styles :as st] [status-im.components.text-field.styles :as st]
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
[status-im.components.animation :as anim] [status-im.components.animation :as anim]
[taoensso.timbre :as log])) [taoensso.timbre :as log]
[status-im.components.styles :refer [separator-color]]))
(def config {:label-top 16 (def config {:label-top 16
@ -26,8 +27,8 @@
:line-style {} :line-style {}
:editable true :editable true
:label-color "#838c93" :label-color "#838c93"
:line-color "#0000001f" :line-color separator-color
:focus-line-color "#0000001f" :focus-line-color separator-color
:error-color "#d50000" :error-color "#d50000"
:secure-text-entry false :secure-text-entry false
:on-focus #() :on-focus #()

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

@ -1,7 +1,9 @@
(ns status-im.components.toolbar.styles (ns status-im.components.toolbar.styles
(:require [status-im.components.styles :refer [text1-color (:require [status-im.components.styles :refer [text1-color
color-white color-white
color-light-gray]])) color-light-gray
color-blue
color-black]]))
(def toolbar-background1 color-white) (def toolbar-background1 color-white)
(def toolbar-background2 color-light-gray) (def toolbar-background2 color-light-gray)
@ -73,10 +75,10 @@
:margin-left 18 :margin-left 18
:margin-top 2 :margin-top 2
:font-size 14 :font-size 14
:color "#7099e6"}) :color color-blue})
(def toolbar-with-search-title (def toolbar-with-search-title
{:color "#000000de" {:color color-black
:align-self :center :align-self :center
:text-align :center :text-align :center
:font-size 16}) :font-size 16})

3
src/status_im/contacts/screen.cljs
View File

@ -23,8 +23,7 @@
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
[status-im.contacts.styles :as st] [status-im.contacts.styles :as st]
[status-im.components.styles :refer [color-blue [status-im.components.styles :refer [color-blue
create-icon create-icon]]))
icon-search]]))
(def contacts-limit 50) (def contacts-limit 50)

10
src/status_im/contacts/styles.cljs
View File

@ -2,12 +2,10 @@
(:require [status-im.components.styles :refer [text1-color (:require [status-im.components.styles :refer [text1-color
text2-color text2-color
text3-color text3-color
text5-color
color-white color-white
color-black
color-light-gray
color-separator color-separator
color-gray2]] color-gray2
color-gray]]
[status-im.components.toolbar.styles :refer [toolbar-background2]] [status-im.components.toolbar.styles :refer [toolbar-background2]]
[status-im.utils.platform :as p])) [status-im.utils.platform :as p]))
@ -201,7 +199,7 @@
(def address-explication (def address-explication
{:textAlign :center {:textAlign :center
:color "#838c93de"}) :color color-gray})
(def buttons-container (def buttons-container
{:position :absolute {:position :absolute
@ -238,5 +236,3 @@
:background-color color-white :background-color color-white
:align-items :center :align-items :center
:justify-content :center}) :justify-content :center})

4
src/status_im/contacts/views/contact_list.cljs
View File

@ -13,10 +13,6 @@
[status-im.components.toolbar.actions :as act] [status-im.components.toolbar.actions :as act]
[status-im.components.toolbar.styles :refer [toolbar-background1]] [status-im.components.toolbar.styles :refer [toolbar-background1]]
[status-im.components.drawer.view :refer [drawer-view open-drawer]] [status-im.components.drawer.view :refer [drawer-view open-drawer]]
[status-im.components.styles :refer [icon-search
icon-back
button-input-container
button-input]]
[status-im.components.image-button.view :refer [scan-button]] [status-im.components.image-button.view :refer [scan-button]]
[status-im.contacts.styles :as st] [status-im.contacts.styles :as st]
[status-im.utils.listview :as lw] [status-im.utils.listview :as lw]

6
src/status_im/contacts/views/new_contact.cljs
View File

@ -17,9 +17,9 @@
toolbar-background1]] toolbar-background1]]
[status-im.utils.utils :refer [log http-post]] [status-im.utils.utils :refer [log http-post]]
[status-im.components.styles :refer [icon-ok [status-im.components.styles :refer [icon-ok
icon-back
button-input-container button-input-container
button-input]] button-input
color-blue]]
[status-im.components.image-button.view :refer [scan-button]] [status-im.components.image-button.view :refer [scan-button]]
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
[cljs.spec :as s] [cljs.spec :as s]
@ -87,7 +87,7 @@
[view button-input-container [view button-input-container
[text-field [text-field
{:error error {:error error
:error-color "#7099e6" :error-color color-blue
:input-style st/qr-input :input-style st/qr-input
:value whisper-identity :value whisper-identity
:wrapper-style button-input :wrapper-style button-input

10
src/status_im/discover/styles.cljs
View File

@ -1,7 +1,7 @@
(ns status-im.discover.styles (ns status-im.discover.styles
(:require [status-im.components.styles :refer [color-gray2 (:require [status-im.components.styles :refer [color-white
color-white color-light-gray
color-light-gray]] color-blue]]
[status-im.components.toolbar.styles :refer [toolbar-background2]])) [status-im.components.toolbar.styles :refer [toolbar-background2]]))
;; Common ;; Common
@ -38,7 +38,7 @@
{}) {})
(def tag-name (def tag-name
{:color "#7099e6" {:color color-blue
:font-size 14 :font-size 14
:padding-right 5 :padding-right 5
:padding-bottom 2 :padding-bottom 2
@ -124,7 +124,7 @@
:flex-direction "row"}) :flex-direction "row"})
(def tag-title (def tag-title
{:color "#7099e6" {:color color-blue
:font-size 14 :font-size 14
:padding-right 5 :padding-right 5
:padding-bottom 2}) :padding-bottom 2})

7
src/status_im/new_group/screen.cljs
View File

@ -10,7 +10,8 @@
list-view list-view
list-item]] list-item]]
[status-im.components.text-field.view :refer [text-field]] [status-im.components.text-field.view :refer [text-field]]
[status-im.components.styles :refer [color-purple]] [status-im.components.styles :refer [color-blue
separator-color]]
[status-im.components.status-bar :refer [status-bar]] [status-im.components.status-bar :refer [status-bar]]
[status-im.components.toolbar.view :refer [toolbar]] [status-im.components.toolbar.view :refer [toolbar]]
[status-im.utils.listview :refer [to-datasource]] [status-im.utils.listview :refer [to-datasource]]
@ -42,8 +43,8 @@
(not (s/valid? ::v/not-illegal-name new-chat-name)) (not (s/valid? ::v/not-illegal-name new-chat-name))
(label :t/illegal-group-chat-name)) (label :t/illegal-group-chat-name))
:wrapper-style st/group-chat-name-wrapper :wrapper-style st/group-chat-name-wrapper
:error-color "#7099e6" :error-color color-blue
:line-color "#0000001f" :line-color separator-color
:label-hidden? true :label-hidden? true
:input-style st/group-chat-name-input :input-style st/group-chat-name-input
:auto-focus true :auto-focus true

11
src/status_im/profile/styles.cljs
View File

@ -1,17 +1,14 @@
(ns status-im.profile.styles (ns status-im.profile.styles
(:require [status-im.components.styles :refer [color-light-blue-transparent (:require [status-im.components.styles :refer [color-white
color-white
color-gray color-gray
color-black color-black
color-blue color-blue
color-blue-transparent color-blue-transparent
selected-message-color
online-color
separator-color
text1-color text1-color
text1-disabled-color text1-disabled-color
text2-color text2-color
color-red]] color-red
separator-color]]
[status-im.utils.platform :as p])) [status-im.utils.platform :as p]))
(def profile (def profile
@ -165,7 +162,7 @@
:elevation 4}) :elevation 4})
(def underline-container (def underline-container
{:background-color "#0000001f" {:background-color separator-color
:margin-bottom 18 :margin-bottom 18
:height 1 :height 1
:align-items :center}) :align-items :center})

2
src/status_im/protocol/listeners.cljs
View File

@ -19,7 +19,7 @@
(defn- parse-content [key {:keys [content]} was-encrypted?] (defn- parse-content [key {:keys [content]} was-encrypted?]
(debug :parse-content (debug :parse-content
"Key exitsts:" (not (nil? key)) "Key exists:" (not (nil? key))
"Content exists:" (not (nil? content))) "Content exists:" (not (nil? content)))
(if (and (not was-encrypted?) key content) (if (and (not was-encrypted?) key content)
(decrypt key content) (decrypt key content)

8
src/status_im/transactions/styles.cljs
View File

@ -1,4 +1,6 @@
(ns status-im.transactions.styles) (ns status-im.transactions.styles
(:require [status-im.components.styles :refer [color-gray
color-black]]))
(def transactions-screen (def transactions-screen
{:flex 1 {:flex 1
@ -83,12 +85,12 @@
(def transaction-info-title (def transaction-info-title
{:textAlign :right {:textAlign :right
:color "#838c93de" :color color-gray
:fontSize 14 :fontSize 14
:lineHeight 20}) :lineHeight 20})
(def transaction-info-value (def transaction-info-value
{:color "#000000de" {:color color-black
:fontSize 14 :fontSize 14
:lineHeight 20 :lineHeight 20
}) })

3
src/status_im/transactions/views/transaction_page.cljs
View File

@ -8,8 +8,7 @@
scroll-view scroll-view
touchable-highlight touchable-highlight
touchable-opacity]] touchable-opacity]]
[status-im.components.styles :refer [icon-ok [status-im.components.styles :refer [icon-close]]
icon-close]]
[status-im.transactions.styles :as st] [status-im.transactions.styles :as st]
[status-im.i18n :refer [label label-pluralize]])) [status-im.i18n :refer [label label-pluralize]]))