Skip to content

Commit

Permalink
Adjust layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaliy Vlasov committed Sep 4, 2019
1 parent dd4cd28 commit 140881c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
5 changes: 3 additions & 2 deletions src/status_im/ui/screens/about_app/views.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@

(views/defview learn-more-sheet []
(views/letsubs [{:keys [title content]} [:bottom-sheet/options]]
[react/view {:style {:padding 16}}
[react/view {:style {:padding-left 16 :padding-top 16
:padding-right 34 :padding-bottom 28}}
[react/view {:style {:align-items :center :flex-direction :row :margin-bottom 16}}
[vector-icons/icon :main-icons/info {:color colors/blue
:container-style {:margin-right 13}}]
Expand All @@ -51,4 +52,4 @@

(def learn-more
{:content learn-more-sheet
:content-height 180})
:content-height 160})
7 changes: 3 additions & 4 deletions src/status_im/ui/screens/intro/views.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
:justify-content :flex-end
;; We have to align top storage entry
;; with top multiaccount entry on the previous screen
:margin-bottom (+ (- 322 226) (if (< view-height 600)
:margin-bottom (+ (- 322 233) (if (< view-height 600)
-20
(/ view-height 12)))}}
[storage-entry (first storage-types) selected-storage-type]
Expand Down Expand Up @@ -264,10 +264,9 @@

:else
[react/view {:style styles/bottom-arrow}
[react/view {:style {:margin-right 20}}
[react/view {:style {:margin-right 10}}
[components.common/bottom-button {:on-press #(re-frame/dispatch
[:intro-wizard/step-forward-pressed])
:style {:margin-right 20}
:disabled? (or processing?
(and (= step :create-code) weak-password?))
:forward? true}]]])
Expand Down Expand Up @@ -317,7 +316,7 @@
[react/keyboard-avoiding-view {:style {:flex 1}}
[toolbar/toolbar
{:style {:border-bottom-width 0
:margin-top 0}}
:margin-top 32}}
(when-not (#{:enable-fingerprint :enable-notifications} step)
(toolbar/nav-button
(actions/back #(re-frame/dispatch
Expand Down

0 comments on commit 140881c

Please sign in to comment.