diff --git a/app/assets/images/hero.jpg b/app/assets/images/hero.jpg deleted file mode 100644 index b06cd0ae..00000000 Binary files a/app/assets/images/hero.jpg and /dev/null differ diff --git a/app/assets/images/pmoney_landing_1.png b/app/assets/images/pmoney_landing_1.png new file mode 100644 index 00000000..662e2841 Binary files /dev/null and b/app/assets/images/pmoney_landing_1.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 646962e8..3817c201 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -19,7 +19,7 @@ .navbar { - background-color: lightyellow; + background-color: white; } @media (max-width: 1024px) { @@ -28,3 +28,22 @@ display: flex; } } + +@media (min-width: 1408px) { + .ml-6-pmoney-fullhd { + margin-left: 3rem !important; + } +} + +.is-pmoney-primary { + background-color: rgb(102, 51, 153); + color: white; +} + +.is-pmoney-primary:hover { + color: white; +} + +.has-text-pmoney-color { + color: rgb(102, 51, 153) !important; +} diff --git a/app/views/account_automatic_topup_configs/edit.html.slim b/app/views/account_automatic_topup_configs/edit.html.slim index ff7d7504..92d1bbd0 100644 --- a/app/views/account_automatic_topup_configs/edit.html.slim +++ b/app/views/account_automatic_topup_configs/edit.html.slim @@ -6,4 +6,4 @@ = f.text_field :amount, autofocus: true, class: "input", placeholder: "Weekly amount" div.buttons.is-flex.is-justify-content-flex-end = link_to 'Back', account_path(account), class: 'button is-light' - = f.submit 'Update', class: "button is-primary" + = f.submit 'Update', class: "button is-pmoney-primary" diff --git a/app/views/account_automatic_topup_configs/new.html.slim b/app/views/account_automatic_topup_configs/new.html.slim index 7f369bf7..3d6ae117 100644 --- a/app/views/account_automatic_topup_configs/new.html.slim +++ b/app/views/account_automatic_topup_configs/new.html.slim @@ -6,4 +6,4 @@ = f.text_field :amount, autofocus: true, class: "input", placeholder: "Weekly amount" div.buttons.is-flex.is-justify-content-flex-end = link_to 'Back', account_path(account), class: 'button is-light' - = f.submit 'Save', class: "button is-primary" + = f.submit 'Save', class: "button is-pmoney-primary" diff --git a/app/views/account_shares/new.html.slim b/app/views/account_shares/new.html.slim index c6dccb37..0a961047 100644 --- a/app/views/account_shares/new.html.slim +++ b/app/views/account_shares/new.html.slim @@ -12,4 +12,4 @@ br div.buttons.is-flex.is-justify-content-flex-end = link_to 'Back', account_shares_path(account), class: 'button is-light' - = f.submit "Send invitation", class: 'button is-primary' + = f.submit "Send invitation", class: 'button is-pmoney-primary' diff --git a/app/views/accounts/edit.html.slim b/app/views/accounts/edit.html.slim index a0b4b8e8..349c024d 100644 --- a/app/views/accounts/edit.html.slim +++ b/app/views/accounts/edit.html.slim @@ -13,4 +13,4 @@ br div.buttons.is-flex.is-justify-content-flex-end = link_to 'Back', account_path(account), class: 'button is-light' - = f.submit 'Save', class: 'button is-primary' + = f.submit 'Save', class: 'button is-pmoney-primary' diff --git a/app/views/accounts/new.html.slim b/app/views/accounts/new.html.slim index da01b682..ddae9e35 100644 --- a/app/views/accounts/new.html.slim +++ b/app/views/accounts/new.html.slim @@ -8,4 +8,4 @@ br div.buttons.is-flex.is-justify-content-flex-end = link_to 'Back', my_account_path, class: 'button is-light' - = f.submit 'Save', class: "button is-primary is-fullwidth" \ No newline at end of file + = f.submit 'Save', class: "button is-pmoney-primary is-fullwidth" \ No newline at end of file diff --git a/app/views/devise/registrations/edit.html.slim b/app/views/devise/registrations/edit.html.slim index e8464846..a387e634 100644 --- a/app/views/devise/registrations/edit.html.slim +++ b/app/views/devise/registrations/edit.html.slim @@ -20,4 +20,4 @@ | (we need your current password to confirm your changes) div.buttons.is-flex.is-justify-content-flex-end = link_to 'Back', request.referer.present? && request.referer != edit_user_registration_path ? request.referer : root_path, class: 'button is-light' - = f.submit "Update", class: "button is-primary" + = f.submit "Update", class: "button is-pmoney-primary" diff --git a/app/views/devise/registrations/new.html.slim b/app/views/devise/registrations/new.html.slim index facce93a..5f4adeea 100644 --- a/app/views/devise/registrations/new.html.slim +++ b/app/views/devise/registrations/new.html.slim @@ -15,7 +15,7 @@ br .actions.is-flex.is-flex-direction-column.is-align-items-end div.is-fullwidth - = f.submit 'Sign up', class: "button is-primary is-fullwidth" + = f.submit 'Sign up', class: "button is-pmoney-primary is-fullwidth" br .is-flex.is-justify-content-center | Already have an account?   diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 53e40398..8d9c9fd3 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,30 +1,28 @@ -
+
-

- Children wallet + is-5-fullhd ml-6-pmoney-fullhd"> +

+ Spend less on kids's toys and save the family budget

-
-
- <%= link_to 'Go!', my_account_path, class: 'button is-primary is-fullwidth' %> -
+
+ <%= link_to 'Go!', my_account_path, class: 'button is-large is-fullwidth has-text-weight-bold is-pmoney-primary ' %>
+ is-4-fullhd is-offset-2-fullhd">
- <%= image_tag('hero.jpg', alt: 'Children wallet') %> + <%= image_tag('pmoney_landing_1.png', alt: 'Children wallet') %>
@@ -52,10 +50,10 @@ is-5-desktop is-offset-1-desktop is-5-widescreen is-offset-1-widescreen is-5-fullhd is-offset-1-fullhd"> -

+

<%= reason[0]['name']%>

-

<%= reason[0]['explanation']%>

+

<%= reason[0]['explanation']%>

@@ -71,10 +69,10 @@ is-5-desktop is-offset-1-desktop is-5-widescreen is-offset-1-widescreen is-5-fullhd is-offset-1-fullhd"> -

+

<%= reason[1]['name']%>

-

<%= reason[1]['explanation']%>

+

<%= reason[1]['explanation']%>

-
-
-
-
-
-
-
- <%= link_to "Let's go!", my_account_path, class: 'button is-primary is-fullwidth' %> -
-
-
-
-
-
-
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c10b489d..a0e6bd49 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,38 +12,40 @@ -