From 07f9dc23e0eaaae134f4dc02f64609536be13c0d Mon Sep 17 00:00:00 2001 From: Rob H Date: Wed, 20 Aug 2014 14:38:40 +1000 Subject: [PATCH] Making button styling a bit nicer --- .../templates/registration/address.html.haml | 5 +++-- .../templates/registration/contact.html.haml | 5 +++-- .../templates/registration/details.html.haml | 13 +++++++------ .../templates/registration/introduction.html.haml | 5 ++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/templates/registration/address.html.haml b/app/assets/javascripts/templates/registration/address.html.haml index 995966b0ab..8b04675896 100644 --- a/app/assets/javascripts/templates/registration/address.html.haml +++ b/app/assets/javascripts/templates/registration/address.html.haml @@ -37,5 +37,6 @@ .small-10.columns %label{ for: 'enterprise_on_map' } Blur my location on the map (show an approximate, not exact pin) .row - %input.button.primary{ type: "button", value: "Back", ng: { click: "select('details')" }, style: 'float:left' } - %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('contact')" }, style: 'float:right' } + .small-12.columns + %input.button.primary{ type: "button", value: "Back", ng: { click: "select('details')" }, style: 'float:left' } + %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('contact')" }, style: 'float:right' } diff --git a/app/assets/javascripts/templates/registration/contact.html.haml b/app/assets/javascripts/templates/registration/contact.html.haml index 7a9b617268..87ed4dfb2e 100644 --- a/app/assets/javascripts/templates/registration/contact.html.haml +++ b/app/assets/javascripts/templates/registration/contact.html.haml @@ -33,5 +33,6 @@ %label{ for: 'contact_display_profile' } %input{ type: 'checkbox', id: 'contact_phone_profile', ng: { model: 'enterprise.contact.phone_in_profile' } }   Display phone in profile .row - %input.button.primary{ type: "button", value: "Back", ng: { click: "select('address')" }, style: 'float:left' } - %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('contact')" }, style: 'float:right' } \ No newline at end of file + .small-12.columns + %input.button.primary{ type: "button", value: "Back", ng: { click: "select('address')" }, style: 'float:left' } + %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('contact')" }, style: 'float:right' } \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/details.html.haml b/app/assets/javascripts/templates/registration/details.html.haml index c6828f4823..167189f4db 100644 --- a/app/assets/javascripts/templates/registration/details.html.haml +++ b/app/assets/javascripts/templates/registration/details.html.haml @@ -6,12 +6,12 @@ .row.content .small-12.columns .row - %label{ for: 'enterprise_name' } Enterprise Name: - .row - %input.chunky.small-12.columns{ id: 'enterprise_name', placeholder: "eg. Charlie's Awesome Farm", ng: { model: 'enterprise.name' } } - .row - Choose One: + .small-12.columns + %label{ for: 'enterprise_name' } Enterprise Name: + %input.chunky.small-12.columns{ id: 'enterprise_name', placeholder: "eg. Charlie's Awesome Farm", ng: { model: 'enterprise.name' } } .row#enterprise-types{ 'data-equalizer' => true } + .small-12.columns + %label Choose One: .medium-12.large-4.columns{ 'data-equalizer-watch' => true } %a.small-12.columns.panel#producer{ href: "#", ng: { click: "enterprise.type = 'producer'", class: "{selected: enterprise.type == 'producer'}" } } .small-2.columns @@ -33,6 +33,7 @@ %h6 I'm Both %span Hey there, Jack-of-all-trades! Not only do you produce yummy things to eat and/or drink, you also want to connect directly to those who love buying your products! .row - %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('address')" }, style: 'float:right' } + .small-12.columns + %input.button.primary{ type: "button", value: "Continue", ng: { click: "select('address')" }, style: 'float:right' } \ No newline at end of file diff --git a/app/assets/javascripts/templates/registration/introduction.html.haml b/app/assets/javascripts/templates/registration/introduction.html.haml index 4b208afed1..415f3f24fc 100644 --- a/app/assets/javascripts/templates/registration/introduction.html.haml +++ b/app/assets/javascripts/templates/registration/introduction.html.haml @@ -21,7 +21,6 @@ %br A pin on the OFN map to help users find you .row - .large-12.columns - .row - %input.button.primary{ type: "button", value: "Let's get started!", ng: { click: "select('details')" }, style: 'float: right' } + .small-12.columns + %input.button.primary{ type: "button", value: "Let's get started!", ng: { click: "select('details')" }, style: 'float: right' } \ No newline at end of file