status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-23 01:09:49 +00:00
Code Issues Projects Releases Wiki Activity

fixed various styling issues

Browse Source 
Signed-off-by: Michele Balistreri <michele@bitgamma.com>
This commit is contained in:
Michele Balistreri 2021-05-28 11:01:34 +03:00
parent 4cd6ada534
commit 114e704b78
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/quo/components/list/item.cljs
View File

@ -157,7 +157,7 @@
[icon-column props] [icon-column props]
[title-column props]]) [title-column props]])
(defn right-side [{:keys [chevron active accessory accessory-text animated-accessory?]}] (defn right-side [{:keys [chevron active disabled accessory accessory-text animated-accessory?]}]
(when (or chevron accessory) (when (or chevron accessory)
[rn/view {:style {:align-items :center [rn/view {:style {:align-items :center
:justify-content :flex-end :justify-content :flex-end
@ -171,12 +171,12 @@
:flex-basis 80}} :flex-basis 80}}
[rn/view {:style (:tiny spacing/padding-horizontal)} [rn/view {:style (:tiny spacing/padding-horizontal)}
(case accessory (case accessory
:radio [controls/radio {:value active}] :radio [controls/radio {:value active :disabled disabled}]
:checkbox [(if animated-accessory? :checkbox [(if animated-accessory?
controls/animated-checkbox controls/animated-checkbox
controls/checkbox) controls/checkbox)
{:value active}] {:value active :disabled disabled}]
:switch [controls/switch {:value active}] :switch [controls/switch {:value active :disabled disabled}]
:text [text/text {:color :secondary :text [text/text {:color :secondary
:ellipsize-mode :middle :ellipsize-mode :middle
:number-of-lines 1} :number-of-lines 1}
@ -250,6 +250,7 @@
:right-side-present? (or accessory chevron)}] :right-side-present? (or accessory chevron)}]
[right-side {:chevron chevron [right-side {:chevron chevron
:active active :active active
:disabled disabled
:on-press on-press :on-press on-press
:accessory-text accessory-text :accessory-text accessory-text
:animated-accessory? animated-accessory? :animated-accessory? animated-accessory?

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

@ -33,6 +33,7 @@
(def wizard-title (def wizard-title
{:margin-bottom 16 {:margin-bottom 16
:typography :header
:text-align :center}) :text-align :center})
(def wizard-text (def wizard-text

2
src/status_im/ui/screens/keycard/frozen_card/view.cljs
View File

@ -44,5 +44,5 @@
[react/view {:margin-top 24} [react/view {:margin-top 24}
[quo/button [quo/button
{:on-press #(re-frame/dispatch [::login/frozen-keycard-popover-dismissed]) {:on-press #(re-frame/dispatch [::login/frozen-keycard-popover-dismissed])
:background? false} :type :secondary}
(i18n/label :t/dismiss)]])]]) (i18n/label :t/dismiss)]])]])

12
src/status_im/ui/screens/keycard/views.cljs
View File

@ -267,10 +267,10 @@
[react/view styles/container [react/view styles/container
[topbar/topbar [topbar/topbar
(merge (merge
{:right-accessories [(when-not hide-login-actions? (when-not hide-login-actions?
{:icon :main-icons/more {:right-accessories [{:icon :main-icons/more
:on-press #(re-frame/dispatch [:keycard.login.pin.ui/more-icon-pressed])})] :on-press #(re-frame/dispatch [:keycard.login.pin.ui/more-icon-pressed])}]})
:title (cond {:title (cond
(#{:reset :reset-confirmation} enter-step) (#{:reset :reset-confirmation} enter-step)
(i18n/label :t/keycard-reset-passcode) (i18n/label :t/keycard-reset-passcode)
@ -351,7 +351,9 @@
:save-password-checkbox? (not (contains? :save-password-checkbox? (not (contains?
#{:reset :reset-confirmation :puk} #{:reset :reset-confirmation :puk}
enter-step))}]) enter-step))}])
(when-not hide-login-actions? (if hide-login-actions?
[react/view {:flex-direction :row
:height 32}]
[toolbar/toolbar [toolbar/toolbar
{:center [quo/button {:center [quo/button
{:on-press #(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]) {:on-press #(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed])