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

[design] remove letter-spacing property 

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
yenda 2019-03-11 23:56:52 +01:00
parent d32f81bbff
commit 670deb1f4c
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
45 changed files with 281 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/status_im/chat/commands/impl/transactions/styles.cljs
View File

@ -69,10 +69,10 @@
:align-items :flex-end :align-items :flex-end
:max-width 250}) :max-width 250})
(defnstyle command-send-amount-text [outgoing] (defn command-send-amount-text
{:font-size 22 [outgoing]
:color (if outgoing colors/white colors/blue) {:font-size 22
:ios {:letter-spacing -0.5}}) :color (if outgoing colors/white colors/blue)})
(def command-send-currency (def command-send-currency
{:flex-direction :column {:flex-direction :column
@ -83,15 +83,13 @@
:color (if outgoing colors/blue colors/blue-light)}) :color (if outgoing colors/blue colors/blue-light)})
(defn command-send-currency-text [outgoing] (defn command-send-currency-text [outgoing]
{:font-size 22 {:font-size 22
:margin-left 4 :margin-left 4
:letter-spacing 1 :color (if outgoing colors/white-transparent colors/gray)})
:color (if outgoing colors/white-transparent colors/gray)})
(defn command-request-currency-text [outgoing] (defn command-request-currency-text [outgoing]
{:font-size 22 {:font-size 22
:letter-spacing 1 :color (if outgoing colors/wild-blue-yonder colors/gray)})
:color (if outgoing colors/wild-blue-yonder colors/gray)})
(defn command-request-timestamp-text [outgoing] (defn command-request-timestamp-text [outgoing]
{:font-size 12 {:font-size 12
@ -152,10 +150,9 @@
{:flex-direction :row {:flex-direction :row
:margin-top 6}) :margin-top 6})
(defnstyle command-request-amount-text [outgoing] (defn command-request-amount-text [outgoing]
{:font-size 22 {:font-size 22
:ios {:letter-spacing -0.5} :color (if outgoing colors/white colors/black)})
:color (if outgoing colors/white colors/black)})
(def command-request-separator-line (def command-request-separator-line
{:background-color colors/gray-light {:background-color colors/gray-light
@ -188,4 +185,3 @@
(def command-request-timestamp-row (def command-request-timestamp-row
{:margin-top 6}) {:margin-top 6})

6
src/status_im/ui/components/action_button/styles.cljs
View File

@ -23,9 +23,8 @@
{:padding-left 16}) {:padding-left 16})
(def action-button-label (def action-button-label
{:color colors/blue {:color colors/blue
:letter-spacing -0.2 :font-size 16})
:font-size 16})
(defstyle actions-list (defstyle actions-list
{:background-color colors/white {:background-color colors/white
@ -43,4 +42,3 @@
:align-items :center :align-items :center
:justify-content :center :justify-content :center
:background-color colors/gray-lighter}) :background-color colors/gray-lighter})

13
src/status_im/ui/components/button/styles.cljs
View File

@ -38,19 +38,12 @@
(merge {:border-color border-color} (merge {:border-color border-color}
(border position))) (border position)))
(defstyle button-text (def button-text
{:font-weight :normal {:font-weight :normal
:color colors/white :color colors/white
:padding-horizontal 16 :padding-horizontal 16
:desktop {:font-size 14 :font-size 15
:padding-vertical 10 :padding-vertical 10})
:letter-spacing 0.5}
:android {:font-size 14
:padding-vertical 10
:letter-spacing 0.5}
:ios {:font-size 15
:padding-vertical 9
:letter-spacing -0.2}})
(defstyle button-text-disabled (defstyle button-text-disabled
{:android {:opacity 0.4} {:android {:opacity 0.4}

7
src/status_im/ui/components/common/common.cljs
View File

@ -60,10 +60,9 @@
(i18n/label :t/mainnet-text))]]])) (i18n/label :t/mainnet-text))]]]))
(defn logo (defn logo
([] (logo nil)) [{:keys [size icon-size]}]
([{:keys [size icon-size shadow?] :or {shadow? true}}] [react/view {:style (styles/logo-container size)}
[react/view {:style (styles/logo-container size shadow?)} [vector-icons/icon :icons/logo (styles/logo icon-size)]])
[vector-icons/icon :icons/logo (styles/logo icon-size)]]))
(defn bottom-button [{:keys [accessibility-label (defn bottom-button [{:keys [accessibility-label
label label

54
src/status_im/ui/components/common/styles.cljs
View File

@ -50,13 +50,10 @@
:padding-bottom 17 :padding-bottom 17
:margin-top 8}}) :margin-top 8}})
(defstyle form-title (def form-title
{:flex-shrink 1 {:flex-shrink 1
:ios {:color colors/text :color colors/text
:letter-spacing -0.2 :font-size 16})
:font-size 16}
:android {:color colors/text-gray
:font-size 14}})
(def form-title-count (def form-title-count
(merge form-title (merge form-title
@ -77,11 +74,10 @@
:align-items :center}) :align-items :center})
(defn network-text [text-color] (defn network-text [text-color]
{:flex 1 {:flex 1
:color (or text-color colors/black) :color (or text-color colors/black)
:letter-spacing -0.2 :font-size 14
:font-size 14 :margin-left 16})
:margin-left 16})
(def network-icon (def network-icon
{:width 40 {:width 40
@ -95,23 +91,13 @@
{:color colors/blue {:color colors/blue
:font-size 15}) :font-size 15})
(defstyle logo-shaddow (defn logo-container [size]
{:ios {:shadowColor colors/black {:width size
:shadowOffset {:height 5} :height size
:shadowRadius 10 :border-radius size
:shadowOpacity 0.14} :background-color colors/blue
:android {:elevation 2}}) :align-items :center
:justify-content :center})
(defn logo-container [size shadow?]
(merge
{:width size
:height size
:border-radius size
:background-color colors/blue
:align-items :center
:justify-content :center}
(when shadow?
logo-shaddow)))
(defn logo [icon-size] (defn logo [icon-size]
{:color :white {:color :white
@ -124,9 +110,8 @@
:opacity (if disabled? 0.4 1)}) :opacity (if disabled? 0.4 1)})
(def bottom-button-label (def bottom-button-label
{:font-size 15 {:font-size 15
:letter-spacing -0.2 :color colors/blue})
:color colors/blue})
(defn button [style background? disabled?] (defn button [style background? disabled?]
(merge (merge
@ -140,10 +125,9 @@
style)) style))
(def button-label (def button-label
{:font-size 15 {:font-size 15
:letter-spacing -0.2 :text-align :center
:text-align :center :color colors/blue})
:color colors/blue})
(defn counter-container [size] (defn counter-container [size]
{:width size {:width size

8
src/status_im/ui/components/contact/styles.cljs
View File

@ -20,11 +20,9 @@
{:flex 1 {:flex 1
:justify-content :center}) :justify-content :center})
(defstyle name-text (def name-text
{:color colors/text {:color colors/text
:android {:font-size 16} :font-size 17})
:ios {:font-size 17
:letter-spacing -0.2}})
(def info-text (def info-text
{:margin-top 1 {:margin-top 1

24
src/status_im/ui/components/desktop/views.cljs
View File

@ -37,10 +37,9 @@
:background-color colors/blue}) :background-color colors/blue})
(def sticky-button-label-style (def sticky-button-label-style
{:color colors/white {:color colors/white
:font-size 17 :font-size 17
:line-height 20 :line-height 20})
:letter-spacing -0.2})
(defn sticky-button [label on-press] (defn sticky-button [label on-press]
[react/touchable-highlight {:on-press on-press} [react/touchable-highlight {:on-press on-press}
@ -48,11 +47,11 @@
[react/text {:style sticky-button-label-style} [react/text {:style sticky-button-label-style}
label]]]) label]]])
(defn button-label-style [enabled?] (defn button-label-style
{:color "#4360df" [enabled?]
:font-size 15 {:color colors/blue
:opacity (if enabled? 1 0.3) :font-size 15
:letter-spacing -0.2}) :opacity (if enabled? 1 0.3)})
(defn button [label enabled? on-press] (defn button [label enabled? on-press]
[react/touchable-highlight {:on-press on-press :disabled (not enabled?)} [react/touchable-highlight {:on-press on-press :disabled (not enabled?)}
@ -67,10 +66,9 @@
label]]]) label]]])
(def text-button-label-style (def text-button-label-style
{:color :white {:color colors/white
:height 23 :height 23
:font-size 15 :font-size 15})
:letter-spacing -0.2})
(defn text-button [label on-press] (defn text-button [label on-press]
[react/touchable-highlight {:on-press on-press} [react/touchable-highlight {:on-press on-press}

11
src/status_im/ui/components/list/styles.cljs
View File

@ -146,12 +146,11 @@
:margin-right 6}) :margin-right 6})
(def new-label-text (def new-label-text
{:color colors/white {:color colors/white
:margin-left 6 :margin-left 6
:margin-right 4 :margin-right 4
:font-size 11 :font-size 11
:letter-spacing 1 :font-weight :bold})
:font-weight :bold})
(def base-separator (def base-separator
{:height 1 {:height 1

6
src/status_im/ui/components/qr_code_viewer/styles.cljs
View File

@ -25,10 +25,9 @@
:ios {:align-items :center} :ios {:align-items :center}
:android {:margin-left 15}}) :android {:margin-left 15}})
(defstyle name-text (def name-text
{:color colors/black {:color colors/black
:font-size 17 :font-size 17})
:ios {:letter-spacing -0.2}})
(def address-text (def address-text
{:color colors/white {:color colors/white
@ -64,7 +63,6 @@
:border-radius 8 :border-radius 8
:text-align :center :text-align :center
:font-size 15 :font-size 15
:letter-spacing -0.2
:line-height 20}) :line-height 20})
(def done-button-text (def done-button-text

16
src/status_im/ui/components/text_input/styles.cljs
View File

@ -4,9 +4,8 @@
[status-im.utils.platform :as p])) [status-im.utils.platform :as p]))
(def label (def label
{:font-size 14 {:font-size 14
:letter-spacing -0.2 :color colors/black})
:color colors/black})
(defn input-container [height] (defn input-container [height]
{:padding 16 {:padding 16
@ -17,13 +16,12 @@
:background-color colors/gray-lighter}) :background-color colors/gray-lighter})
(defstyle input (defstyle input
{:font-size 15 {:font-size 15
:letter-spacing -0.2 :color colors/black
:color colors/black :padding 0
:padding 0 :desktop {:height 52}})
:desktop {:height 52}})
(defn error [label?] (defn error [label?]
{:bottom-value (if label? -20 0) {:bottom-value (if label? -20 0)
:color colors/red-light :color colors/red-light
:font-size 12}) :font-size 12})

11
src/status_im/ui/components/toolbar/styles.cljs
View File

@ -17,12 +17,11 @@
:flex-direction :column :flex-direction :column
:margin-left 6}) :margin-left 6})
(defstyle toolbar-title-text (def toolbar-title-text
{:color colors/black {:color colors/black
:letter-spacing -0.2 :font-size 17
:font-size 17 :font-weight :bold
:font-weight :bold :text-align :center})
:text-align :center})
(defn toolbar-actions-container [actions-count custom] (defn toolbar-actions-container [actions-count custom]
(merge {:flex-direction :row} (merge {:flex-direction :row}

18
src/status_im/ui/screens/accounts/create/styles.cljs
View File

@ -15,12 +15,11 @@
:margin-bottom 100}) :margin-bottom 100})
(def account-creating-text (def account-creating-text
{:font-size 14 {:font-size 14
:line-height 21 :line-height 21
:letter-spacing -0.2 :text-align :center
:text-align :center :color colors/black
:color colors/black :margin-top 16})
:margin-top 16})
(def logo-container (def logo-container
{:margin-top 16 {:margin-top 16
@ -35,10 +34,9 @@
:margin-top 16}) :margin-top 16})
(def input-description (def input-description
{:font-size 14 {:font-size 14
:letter-spacing -0.2 :color colors/gray
:color colors/gray :line-height 21})
:line-height 21})
(def bottom-container (def bottom-container
{:flex-direction :row {:flex-direction :row

19
src/status_im/ui/screens/accounts/styles.cljs
View File

@ -16,10 +16,9 @@
(def account-image-size 40) (def account-image-size 40)
(defstyle account-title-text (def account-title-text
{:color :black {:color :black
:font-size 17 :font-size 17})
:ios {:letter-spacing -0.2}})
(defstyle accounts-list-container (defstyle accounts-list-container
{:flex 1 {:flex 1
@ -40,15 +39,13 @@
:flex-shrink 1}) :flex-shrink 1})
(def account-badge-text (def account-badge-text
{:font-size 17 {:font-size 17
:letter-spacing -0.2 :color colors/black})
:color colors/black})
(defstyle account-badge-pub-key-text (def account-badge-pub-key-text
{:font-size 14 {:font-size 14
:ios {:letter-spacing -0.2} :color colors/gray
:color colors/gray :margin-top 4})
:margin-top 4})
(def bottom-button-container (def bottom-button-container
{:margin-top 14 {:margin-top 14

3
src/status_im/ui/screens/add_new/new_chat/styles.cljs
View File

@ -5,11 +5,10 @@
{:margin-horizontal 14 {:margin-horizontal 14
:margin-top 4 :margin-top 4
:font-size 12 :font-size 12
:letter-spacing -0.2
:color colors/red}) :color colors/red})
(def list-title (def list-title
{:margin-top 24 {:margin-top 24
:margin-left 16 :margin-left 16
:font-size 14 :font-size 14
:color colors/gray}) :color colors/gray})

9
src/status_im/ui/screens/add_new/new_public_chat/styles.cljs
View File

@ -5,7 +5,6 @@
(def group-chat-name-input (def group-chat-name-input
{:font-size 17 {:font-size 17
:padding-bottom 0 :padding-bottom 0
:letter-spacing -0.2
:color colors/black}) :color colors/black})
(def topic-hash (def topic-hash
@ -20,11 +19,9 @@
(def chat-name-container (def chat-name-container
{:margin-top 10}) {:margin-top 10})
(defstyle members-text (def members-text
{:color colors/gray {:color colors/gray
:ios {:letter-spacing -0.2 :font-size 16})
:font-size 16}
:android {:font-size 14}})
(def section-title (def section-title
(merge members-text (merge members-text

1
src/status_im/ui/screens/add_new/styles.cljs
View File

@ -36,7 +36,6 @@
(defstyle input (defstyle input
{:flex 1 {:flex 1
:font-size 15 :font-size 15
:letter-spacing -0.2
:padding-horizontal 14 :padding-horizontal 14
:desktop {:height 30 :desktop {:height 30
:width "100%"} :width "100%"}

15
src/status_im/ui/screens/bootnodes_settings/edit_bootnode/styles.cljs
View File

@ -12,10 +12,9 @@
:margin-top 15}) :margin-top 15})
(defstyle input (defstyle input
{:flex 1 {:flex 1
:font-size 15 :font-size 15
:letter-spacing -0.2 :android {:padding 0}})
:android {:padding 0}})
(def qr-code (def qr-code
{:margin-right 14}) {:margin-right 14})
@ -42,11 +41,9 @@
:border-radius 8 :border-radius 8
:ios {:opacity 0.9}}) :ios {:opacity 0.9}})
(defstyle button-label (def button-label
{:color colors/white {:color colors/white
:ios {:font-size 17 :font-size 17})
:letter-spacing -0.2}
:android {:font-size 14}})
(defstyle delete-button (defstyle delete-button
(assoc button (assoc button

10
src/status_im/ui/screens/bootnodes_settings/styles.cljs
View File

@ -17,12 +17,10 @@
:ios {:height 64} :ios {:height 64}
:android {:height 56}}) :android {:height 56}})
(defstyle bootnode-item-name-text (def bootnode-item-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17
:letter-spacing -0.2 :line-height 20})
:line-height 20}
:android {:font-size 16}})
(defstyle switch-container (defstyle switch-container
{:height 50 {:height 50

12
src/status_im/ui/screens/browser/site_blocked/styles.cljs
View File

@ -13,22 +13,20 @@
:justify-content :center :justify-content :center
:align-items :center}) :align-items :center})
(defstyle title-text (def title-text
{:color colors/black {:color colors/black
:font-size 17 :font-size 17
:font-weight :bold :font-weight :bold
:margin-top 26 :margin-top 26
:margin-bottom 10 :margin-bottom 10
:line-height 20 :line-height 20
:text-align :center :text-align :center})
:ios {:letter-spacing -0.4}})
(defstyle description-text (def description-text
{:color colors/gray {:color colors/gray
:font-size 15 :font-size 15
:line-height 22 :line-height 22
:text-align :center :text-align :center})
:ios {:letter-spacing -0.2}})
(def chat-link-text (def chat-link-text
{:color colors/blue}) {:color colors/blue})
@ -36,4 +34,4 @@
(def buttons-container (def buttons-container
{:flex-direction :row {:flex-direction :row
:justify-content :center :justify-content :center
:margin-top 24}) :margin-top 24})

5
src/status_im/ui/screens/browser/styles.cljs
View File

@ -82,9 +82,8 @@
:margin-horizontal 5}) :margin-horizontal 5})
(def url-text (def url-text
{:font-size 15 {:font-size 15
:line-height 22 :line-height 22})
:letter-spacing -0.2})
(def dot (def dot
{:height 4 {:height 4

14
src/status_im/ui/screens/chat/styles/main.cljs
View File

@ -185,12 +185,11 @@
{:flex-direction :row {:flex-direction :row
:align-items :center}) :align-items :center})
(defstyle add-contact-text (def add-contact-text
{:text-align :center {:text-align :center
:text-align-vertical :center :text-align-vertical :center
:padding-left 4 :padding-left 4
:font-size 15 :font-size 15
:ios {:letter-spacing 0.2}
:color colors/blue}) :color colors/blue})
(def add-contact-close-icon (def add-contact-close-icon
@ -217,12 +216,11 @@
:margin-right 6}) :margin-right 6})
(def empty-chat-text (def empty-chat-text
{:color colors/gray {:color colors/gray
:width 280 :width 280
:font-size 15 :font-size 15
:line-height 22 :line-height 22
:letter-spacing -0.2 :text-align :center})
:text-align :center})
(def empty-chat-text-name (def empty-chat-text-name
{:margin-bottom 5 {:margin-bottom 5

3
src/status_im/ui/screens/chat/styles/message/datemark.cljs
View File

@ -10,7 +10,6 @@
{:margin-top 16 {:margin-top 16
:height 22}) :height 22})
(defstyle datemark-text (def datemark-text
{:color colors/gray {:color colors/gray
:ios {:letter-spacing -0.2}
:font-size 15}) :font-size 15})

13
src/status_im/ui/screens/chat/styles/message/message.cljs
View File

@ -5,12 +5,10 @@
[status-im.utils.platform :as platform] [status-im.utils.platform :as platform]
[status-im.constants :as constants])) [status-im.constants :as constants]))
(defnstyle style-message-text [outgoing] (defn style-message-text
[outgoing]
{:font-size 15 {:font-size 15
:color (if outgoing colors/white colors/text) :color (if outgoing colors/white colors/text)})
:letter-spacing -0.2
:android {:line-height 22}
:ios {:line-height 22}})
(defn message-padding-top (defn message-padding-top
[{:keys [first-in-group? display-username?]}] [{:keys [first-in-group? display-username?]}]
@ -36,9 +34,8 @@
{:padding-left 8})))) {:padding-left 8}))))
(def message-timestamp (def message-timestamp
{:font-size 10 {:font-size 10
:letter-spacing 0.1 :align-self :flex-end})
:align-self :flex-end})
(defn message-timestamp-text [justify-timestamp? outgoing rtl? emoji?] (defn message-timestamp-text [justify-timestamp? outgoing rtl? emoji?]
(merge message-timestamp (merge message-timestamp

10
src/status_im/ui/screens/currency_settings/styles.cljs
View File

@ -15,9 +15,7 @@
:ios {:height 64} :ios {:height 64}
:android {:height 56}}) :android {:height 56}})
(defstyle currency-name-text (def currency-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17
:letter-spacing -0.2 :line-height 20})
:line-height 20}
:android {:font-size 16}})

9
src/status_im/ui/screens/extensions/add/styles.cljs
View File

@ -20,10 +20,9 @@
:margin-top 15}) :margin-top 15})
(defstyle input (defstyle input
{:flex 1 {:flex 1
:font-size 15 :font-size 15
:letter-spacing -0.2 :android {:padding 0}})
:android {:padding 0}})
(def bottom-container (def bottom-container
{:flex-direction :row {:flex-direction :row
@ -55,4 +54,4 @@
:background-color colors/white-transparent}) :background-color colors/white-transparent})
(def qr-code (def qr-code
{:margin-right 14}) {:margin-right 14})

1
src/status_im/ui/screens/extensions/styles.cljs
View File

@ -21,7 +21,6 @@
(defstyle extension-item-name-text (defstyle extension-item-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :ios {:font-size 17
:letter-spacing -0.2
:line-height 20} :line-height 20}
:android {:font-size 16}}) :android {:font-size 16}})

23
src/status_im/ui/screens/fleet_settings/styles.cljs
View File

@ -18,21 +18,15 @@
:ios {:height 64} :ios {:height 64}
:android {:height 56}}) :android {:height 56}})
(defstyle fleet-item-name-text (def fleet-item-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17
:letter-spacing -0.2 :line-height 20})
:line-height 20}
:desktop {:font-size 16}
:android {:font-size 16}})
(defstyle fleet-item-connected-text (defstyle fleet-item-connected-text
{:color colors/gray {:color colors/gray
:ios {:font-size 14 :font-size 14
:margin-top 6 :margin-top 6})
:letter-spacing -0.2}
:android {:font-size 12
:margin-top 2}})
(defn fleet-icon-container [current?] (defn fleet-icon-container [current?]
{:width 40 {:width 40
@ -45,4 +39,5 @@
:justify-content :center}) :justify-content :center})
(defn fleet-icon [current?] (defn fleet-icon [current?]
(hash-map (if platform/desktop? :tint-color :color) (if current? :white :gray))) (hash-map (if platform/desktop? :tint-color :color)
(if current? :white :gray)))

1
src/status_im/ui/screens/hardwallet/connect/styles.cljs
View File

@ -74,7 +74,6 @@
(def turn-nfc-text (def turn-nfc-text
{:text-transform :uppercase {:text-transform :uppercase
:line-height 20 :line-height 20
:letter-spacing 0.5
:color colors/gray}) :color colors/gray})
(def go-to-settings-text (def go-to-settings-text

18
src/status_im/ui/screens/home/styles.cljs
View File

@ -185,14 +185,13 @@
:height 278}) :height 278})
(defstyle welcome-text (defstyle welcome-text
{:line-height 28 {:line-height 28
:font-size 22 :font-size 22
:font-weight :bold :font-weight :bold
:letter-spacing -0.3 :android {:margin-top 22}
:android {:margin-top 22} :ios {:margin-top 96}
:ios {:margin-top 96} :text-align :center
:text-align :center :color colors/black})
:color colors/black})
(defstyle welcome-text-description (defstyle welcome-text-description
{:line-height 21 {:line-height 21
@ -204,8 +203,7 @@
(def toolbar-logo (def toolbar-logo
{:size 40 {:size 40
:icon-size 17 :icon-size 17})
:shadow? false})
(def action-button-container (def action-button-container
{:position :absolute {:position :absolute

25
src/status_im/ui/screens/log_level_settings/styles.cljs
View File

@ -18,21 +18,15 @@
:ios {:height 64} :ios {:height 64}
:android {:height 56}}) :android {:height 56}})
(defstyle log-level-item-name-text (def log-level-item-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17
:letter-spacing -0.2 :line-height 20})
:line-height 20}
:desktop {:font-size 16}
:android {:font-size 16}})
(defstyle log-level-item-connected-text (def log-level-item-connected-text
{:color colors/gray {:color colors/gray
:ios {:font-size 14 :font-size 14
:margin-top 6 :margin-top 6})
:letter-spacing -0.2}
:android {:font-size 12
:margin-top 2}})
(defn log-level-icon-container [current?] (defn log-level-icon-container [current?]
{:width 40 {:width 40
@ -45,4 +39,5 @@
:justify-content :center}) :justify-content :center})
(defn log-level-icon [current?] (defn log-level-icon [current?]
(hash-map (if platform/desktop? :tint-color :color) (if current? :white :gray))) (hash-map (if platform/desktop? :tint-color :color)
(if current? :white :gray)))

6
src/status_im/ui/screens/network_settings/edit_network/styles.cljs
View File

@ -15,12 +15,6 @@
{:flex-direction :row {:flex-direction :row
:align-items :center}) :align-items :center})
(defstyle network-type-text
{:color colors/black
:ios {:font-size 17
:letter-spacing -0.2}
:android {:font-size 16}})
(def bottom-container (def bottom-container
{:flex-direction :row {:flex-direction :row
:margin-horizontal 12 :margin-horizontal 12

96
src/status_im/ui/screens/network_settings/styles.cljs
View File

@ -7,28 +7,24 @@
{:flex 1 {:flex 1
:background-color :white}) :background-color :white})
(defstyle badge-name-text (def badge-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17})
:letter-spacing -0.2}
:android {:font-size 16}})
(defstyle badge-connected-text (defstyle badge-connected-text
{:color colors/gray {:color colors/gray
:ios {:margin-top 5} :ios {:margin-top 5}})
:android {:font-size 13}})
(defstyle paste-json-text-input (defstyle paste-json-text-input
{:ios {:font-size 17 {:ios {:font-size 17
:line-height 24 :line-height 24}})
:letter-spacing -0.2}})
(def connect-button-container (def connect-button-container
{:margin-top 8 {:margin-top 8
:margin-bottom 16 :margin-bottom 16
:margin-horizontal 16}) :margin-horizontal 16})
(defstyle connect-button (def connect-button
{:height 52 {:height 52
:align-items :center :align-items :center
:justify-content :center :justify-content :center
@ -36,18 +32,14 @@
:border-radius 8 :border-radius 8
:ios {:opacity 0.9}}) :ios {:opacity 0.9}})
(defstyle connect-button-label (def connect-button-label
{:color colors/white {:color colors/white
:ios {:font-size 17 :font-size 17})
:letter-spacing -0.2}
:android {:font-size 14}})
(defstyle connect-button-description (def connect-button-description
{:color colors/gray {:color colors/gray
:ios {:margin-top 8 :margin-top 8
:height 20} :height 20})
:android {:margin-top 12
:font-size 12}})
(defstyle network-config-container (defstyle network-config-container
{:height 160 {:height 160
@ -61,19 +53,15 @@
:android {:border-radius 4}}) :android {:border-radius 4}})
(defstyle network-config-text (defstyle network-config-text
{:color colors/black {:color colors/black
:ios {:opacity 0.8 :font-size 17
:font-size 17 :line-height 24
:line-height 24 :ios {:opacity 0.8}
:letter-spacing -0.2} :android {:opacity 0.4}})
:android {:opacity 0.4
:font-size 16
:line-height 24}})
(def edit-button-container (def edit-button-container
{:margin-top 16 {:align-items :center
:align-items :center :margin-vertical 16
:margin-bottom 16
:margin-horizontal 16}) :margin-horizontal 16})
(defstyle edit-button (defstyle edit-button
@ -83,30 +71,25 @@
:background-color colors/blue :background-color colors/blue
:border-radius 8 :border-radius 8
:ios {:width 343} :ios {:width 343}
:android {:width 328}}) :android {:width 328}})
(defstyle edit-button-label (def edit-button-label
{:color colors/blue {:color colors/blue
:ios {:font-size 17 :font-size 17})
:letter-spacing -0.2}
:android {:font-size 14}})
(defstyle edit-button-description (def edit-button-description
{:text-align :center {:text-align :center
:color colors/gray :color colors/gray
:ios {:margin-top 8 :margin-top 8
:font-size 14 :font-size 14})
:letter-spacing -0.2}
:android {:margin-top 12
:font-size 12}})
(defn network-icon [connected? size] (defn network-icon [connected? size]
{:width size {:width size
:height size :height size
:border-radius (/ size 2) :border-radius (/ size 2)
:background-color (if connected? colors/blue colors/gray-lighter) :background-color (if connected? colors/blue colors/gray-lighter)
:align-items :center :justify-content :center}) :align-items :center
:justify-content :center})
(def network-badge (def network-badge
{:height 88 {:height 88
@ -122,20 +105,15 @@
:ios {:height 64} :ios {:height 64}
:android {:height 56}}) :android {:height 56}})
(defstyle network-item-name-text (def network-item-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17
:letter-spacing -0.2 :line-height 20})
:line-height 20}
:android {:font-size 16}})
(defstyle network-item-connected-text (def network-item-connected-text
{:color colors/gray {:color colors/gray
:ios {:font-size 14 :font-size 14
:margin-top 6 :margin-top 6})
:letter-spacing -0.2}
:android {:font-size 12
:margin-top 2}})
(def bottom-container (def bottom-container
{:flex-direction :row {:flex-direction :row

9
src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/styles.cljs
View File

@ -19,7 +19,6 @@
(defstyle input (defstyle input
{:flex 1 {:flex 1
:font-size 15 :font-size 15
:letter-spacing -0.2
:android {:padding 0}}) :android {:padding 0}})
(def qr-code (def qr-code
@ -50,8 +49,6 @@
(assoc button (assoc button
:background-color colors/red)) :background-color colors/red))
(defstyle button-label (def button-label
{:color colors/white {:color colors/white
:ios {:font-size 17 :font-size 17})
:letter-spacing -0.2}
:android {:font-size 14}})

17
src/status_im/ui/screens/offline_messaging_settings/styles.cljs
View File

@ -23,20 +23,9 @@
:android {:height 56}}) :android {:height 56}})
(defstyle mailserver-item-name-text (defstyle mailserver-item-name-text
{:color colors/black {:color colors/black
:ios {:font-size 17 :font-size 17
:letter-spacing -0.2 :line-height 20})
:line-height 20}
:desktop {:font-size 16}
:android {:font-size 16}})
(defstyle mailserver-item-connected-text
{:color colors/gray
:ios {:font-size 14
:margin-top 6
:letter-spacing -0.2}
:android {:font-size 12
:margin-top 2}})
(defn mailserver-icon-container [connected?] (defn mailserver-icon-container [connected?]
{:width 40 {:width 40

8
src/status_im/ui/screens/pairing/styles.cljs
View File

@ -104,8 +104,6 @@
:margin-top 15}) :margin-top 15})
(defstyle input (defstyle input
{:flex 1 {:flex 1
:font-size 15 :font-size 15
:letter-spacing -0.2 :android {:padding 0}})
:android {:padding 0}})

8
src/status_im/ui/screens/profile/components/styles.cljs
View File

@ -32,8 +32,7 @@
:flex 1 :flex 1
:desktop {:height 20 :desktop {:height 20
:width 200} :width 200}
:ios {:letter-spacing -0.2 :ios {:margin-top 1
:margin-top 1
:height 45 :height 45
:border-bottom-width 1 :border-bottom-width 1
:border-bottom-color colors/gray-light} :border-bottom-color colors/gray-light}
@ -91,12 +90,11 @@
:font-size 15 :font-size 15
:color colors/gray}) :color colors/gray})
(defstyle settings-title (def settings-title
{:color colors/gray {:color colors/gray
:margin-left 16 :margin-left 16
:margin-top 18 :margin-top 18
:font-size 14 :font-size 14})
:ios {:letter-spacing -0.2}})
;; shared profile styles ;; shared profile styles

19
src/status_im/ui/screens/profile/contact/styles.cljs
View File

@ -4,7 +4,7 @@
(def network-info {:background-color :white}) (def network-info {:background-color :white})
(defstyle profile-info-item (def profile-info-item
{:flex-direction :row {:flex-direction :row
:align-items :center :align-items :center
:padding-left 16}) :padding-left 16})
@ -13,20 +13,17 @@
{:flex 1 {:flex 1
:padding-right (if options 16 40)}) :padding-right (if options 16 40)})
(defstyle profile-info-title (def profile-info-title
{:color colors/gray {:color colors/gray
:font-size 14 :font-size 14})
:ios {:letter-spacing -0.2}})
(defstyle profile-setting-spacing (defstyle profile-setting-spacing
{:ios {:height 10} {:ios {:height 10}
:android {:height 7}}) :android {:height 7}})
(defstyle profile-setting-text (def profile-setting-text
{:ios {:font-size 17 {:font-size 17
:letter-spacing -0.2} :color colors/black})
:android {:font-size 16
:color colors/black}})
(def action-container (def action-container
{:background-color colors/white}) {:background-color colors/white})
@ -60,6 +57,6 @@
(merge profile-setting-text (merge profile-setting-text
{:color colors/gray})) {:color colors/gray}))
(defstyle contact-profile-info-container (def contact-profile-info-container
{:padding-top 26 {:padding-top 26
:background-color colors/white}) :background-color colors/white})

61
src/status_im/ui/screens/profile/seed/styles.cljs
View File

@ -33,16 +33,14 @@
{:flex-direction :row}) {:flex-direction :row})
(def six-word-num (def six-word-num
{:width 25 {:width 25
:text-align :right :text-align :right
:opacity 0.4 :opacity 0.4
:font-size 15 :font-size 15})
:letter-spacing -0.2})
(def six-words-word (def six-words-word
{:margin-left 24 {:margin-left 24
:font-size 15 :font-size 15})
:letter-spacing -0.2})
(def six-words-separator (def six-words-separator
{:height 12}) {:height 12})
@ -52,14 +50,12 @@
:padding 16}) :padding 16})
(def twelve-words-label (def twelve-words-label
{:font-size 14 {:font-size 14
:line-height 21 :line-height 21})
:letter-spacing -0.2})
(def twelve-words-description (def twelve-words-description
{:font-size 14 {:font-size 14
:line-height 21 :line-height 21})
:letter-spacing -0.2})
(def twelve-words-spacer (def twelve-words-spacer
{:flex 1}) {:flex 1})
@ -88,22 +84,19 @@
{:flex-direction :row}) {:flex-direction :row})
(def enter-word-label (def enter-word-label
{:font-size 14 {:font-size 14
:line-height 21 :line-height 21})
:letter-spacing -0.2})
(def enter-word-n (def enter-word-n
{:margin-left 8 {:margin-left 8
:font-size 14 :font-size 14
:line-height 21 :line-height 21
:letter-spacing -0.2 :color colors/gray})
:color colors/gray})
(def enter-word-n-description (def enter-word-n-description
{:font-size 14 {:font-size 14
:line-height 21 :line-height 21
:letter-spacing -0.2 :color colors/gray})
:color colors/gray})
(def finish-container (def finish-container
{:flex 1 {:flex 1
@ -121,11 +114,10 @@
:height 41}) :height 41})
(def finish-label (def finish-label
{:font-size 22 {:font-size 22
:font-weight :bold :font-weight :bold
:line-height 30 :line-height 30
:letter-spacing -0.3 :text-align :center})
:text-align :center})
(def finish-description (def finish-description
{:margin-top 8 {:margin-top 8
@ -140,10 +132,9 @@
:margin-bottom 32}) :margin-bottom 32})
(def backup-seed (def backup-seed
{:font-weight :bold {:font-weight :bold
:font-size 15 :font-size 15
:letter-spacing -0.2 :text-align :center})
:text-align :center})
(def step-n (def step-n
{:margin-top 5 {:margin-top 5

2
src/status_im/ui/screens/profile/seed/views.cljs
View File

@ -129,7 +129,7 @@
(defn finish [] (defn finish []
[react/view {:style styles/finish-container} [react/view {:style styles/finish-container}
[react/view {:style styles/finish-logo-container} [react/view {:style styles/finish-logo-container}
[react/view {:style (components.common.styles/logo-container 80 true)} [react/view {:style (components.common.styles/logo-container 80)}
[icons/icon :main-icons/check styles/ok-icon]]] [icons/icon :main-icons/check styles/ok-icon]]]
[react/text {:style styles/finish-label} [react/text {:style styles/finish-label}
(i18n/label :t/you-are-all-set)] (i18n/label :t/you-are-all-set)]

5
src/status_im/ui/screens/profile/user/styles.cljs
View File

@ -62,9 +62,8 @@
:align-items :center}) :align-items :center})
(def advanced-button-label (def advanced-button-label
{:font-size 15 {:font-size 15
:letter-spacing -0.2 :color colors/blue})
:color colors/blue})
(def pair-button (def pair-button
{:margin-left 32}) {:margin-left 32})

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

@ -61,8 +61,7 @@
:flex 1 :flex 1
:padding-bottom 0 :padding-bottom 0
:padding-top 0 :padding-top 0
:height 52 :height 52}))
:letter-spacing -0.2}))
(def contact-code-text-input (def contact-code-text-input
{:text-align-vertical :top {:text-align-vertical :top
@ -81,9 +80,8 @@
{:color colors/white-transparent})) {:color colors/white-transparent}))
(def network (def network
{:color :white {:color :white
:font-size 13 :font-size 13})
:letter-spacing -0.2})
(def network-container (def network-container
{:padding-horizontal 10 {:padding-horizontal 10
@ -159,15 +157,13 @@
:border-radius 8}) :border-radius 8})
(def wallet-name (def wallet-name
{:color :white {:color colors/white
:font-size 15 :font-size 15})
:letter-spacing -0.2})
(defn participant [address?] (defn participant [address?]
{:color (if address? :white colors/white-transparent) {:color (if address? :white colors/white-transparent)
:flex-shrink 1 :flex-shrink 1
:font-size 15 :font-size 15})
:letter-spacing -0.2})
(def recipient-container (def recipient-container
{:flex-direction :row}) {:flex-direction :row})
@ -197,10 +193,9 @@
:flex-direction :row}) :flex-direction :row})
(def wallet-value (def wallet-value
{:padding-left 6 {:padding-left 6
:color colors/white-transparent :color colors/white-transparent
:font-size 15 :font-size 15})
:letter-spacing -0.2})
(def wallet-value-amount (def wallet-value-amount
{:flex -1}) {:flex -1})
@ -211,7 +206,5 @@
:background-color colors/white-light-transparent}) :background-color colors/white-light-transparent})
(def button-text (def button-text
{:color :white {:color colors/white
:font-size 15 :font-size 15})
:letter-spacing -0.2})

7
src/status_im/ui/screens/wallet/components/views.cljs
View File

@ -35,10 +35,9 @@
(defn text-input [props text] (defn text-input [props text]
[react/text-input (utils.core/deep-merge {:placeholder-text-color colors/white-transparent [react/text-input (utils.core/deep-merge {:placeholder-text-color colors/white-transparent
:selection-color colors/white :selection-color colors/white
:style {:color colors/white :style {:color colors/white
:font-size 15 :font-size 15
:height 52 :height 52}}
:letter-spacing -0.2}}
props) props)
text]) text])

9
src/status_im/ui/screens/wallet/main/styles.cljs
View File

@ -124,11 +124,10 @@
:margin-left 6}) :margin-left 6})
(def wallet-address (def wallet-address
{:color :white {:color colors/white
:text-align :center :text-align :center
:font-size 15 :font-size 15
:letter-spacing -0.2 :line-height 20})
:line-height 20})
(def address-section (def address-section
{:flex-grow 1 {:flex-grow 1

31
src/status_im/ui/screens/wallet/onboarding/styles.cljs
View File

@ -19,10 +19,9 @@
:justify-content :center}) :justify-content :center})
(def signing-word-text (def signing-word-text
{:font-size 15 {:font-size 15
:font-weight "600" :font-weight "600"
:color colors/black :color colors/black})
:letter-spacing -0.2})
(def bottom-buttons (def bottom-buttons
{:background-color colors/blue {:background-color colors/blue
@ -79,21 +78,19 @@
:height 312}) :height 312})
(def onboarding-title (def onboarding-title
{:line-height 28 {:line-height 28
:font-size 22 :font-size 22
:font-weight :bold :font-weight :bold
:letter-spacing -0.3 :text-align :center
:text-align :center :color colors/white})
:color colors/white})
(def onboarding-text (def onboarding-text
{:line-height 21 {:line-height 21
:margin-top 8 :margin-top 8
:margin-bottom 32 :margin-bottom 32
:font-size 14 :font-size 14
:letter-spacing -0.2 :text-align :center
:text-align :center :color colors/white-transparent})
:color colors/white-transparent})
(def set-up-button (def set-up-button
{:flex-direction :row {:flex-direction :row

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

@ -37,9 +37,8 @@
:background-color colors/gray-lighter}) :background-color colors/gray-lighter})
(def signing-phrase (def signing-phrase
{:font-size 15 {:font-size 15
:letter-spacing -0.2 :color colors/black})
:color colors/black})
(def signing-phrase-description (def signing-phrase-description
{:padding-top 8}) {:padding-top 8})
@ -49,10 +48,9 @@
:padding-vertical 20}) :padding-vertical 20})
(def password (def password
{:padding 0 {:padding 0
:font-size 15 :font-size 15
:letter-spacing -0.2 :height 20})
:height 20})
(def processing-view (def processing-view
{:position :absolute {:position :absolute