From 7bf969ca1b6b4c0a0edc3eb4d5b9e3605f46af49 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 9 May 2014 16:27:28 +1000 Subject: [PATCH] Removing empty containers and adding classes for padding required --- app/views/checkout/_authentication.html.haml | 7 ++-- app/views/checkout/_form.html.haml | 6 ++-- app/views/shared/_footer.html.haml | 35 +++++++++----------- 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/app/views/checkout/_authentication.html.haml b/app/views/checkout/_authentication.html.haml index 9f8a7c1231..e89e6d87ac 100644 --- a/app/views/checkout/_authentication.html.haml +++ b/app/views/checkout/_authentication.html.haml @@ -1,12 +1,9 @@ %section{"ng-show" => "!enabled"} - %p - %p .row .small-12.columns.text-center{"ng-controller" => "AuthenticationCtrl"} - %h3 Ok, ready to checkout? - %p + %h3.pad-top Ok, ready to checkout? .row - .small-5.columns.text-center + .small-5.columns.text-center.pad-top %button.primary.expand{"ng-click" => "open()"} Log in .small-2.columns.text-center %p.pad-top -OR- diff --git a/app/views/checkout/_form.html.haml b/app/views/checkout/_form.html.haml index 4afc28afaf..d2e65d6cb4 100644 --- a/app/views/checkout/_form.html.haml +++ b/app/views/checkout/_form.html.haml @@ -11,10 +11,8 @@ -#{{ Order.order == order }} .small-12.columns - %p - %h3.text-center Checkout from !hub_name! + %h3.text-center.pad-top Checkout from !hub_name! = render partial: "checkout/details", locals: {f: f} = render partial: "checkout/billing", locals: {f: f} = render partial: "checkout/shipping", locals: {f: f} - = render partial: "checkout/payment", locals: {f: f} - %p \ No newline at end of file + = render partial: "checkout/payment", locals: {f: f} \ No newline at end of file diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 5e6313e3cc..bb33312652 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -32,24 +32,21 @@ %h4 About us %p OFN is a network of independent online food stores that connect farmers and food hubs with individuals and local businesses. It gives farmers and food hubs an easier and fairer way to distribute their food. .row.landing-page-row - .small-12.columns.text-center - %p - %p - %hr - %br - %h5 - %a{title: 'Open Food Network', href:'http://www.openfoodnetwork.org', target: '_blank' } openfoodnetwork.org - %br - © Copyright 2014 Open Food Foundation - %br + .small-12.columns.text-center.pad-top + %hr + %h5.pad-top + %a{title: 'Open Food Network', href:'http://www.openfoodnetwork.org', target: '_blank' } openfoodnetwork.org + %br + © Copyright 2014 Open Food Foundation + %p %small %a{href:"https://creativecommons.org/licenses/by-sa/3.0/", target: "_blank" } Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) - %br - %small - %a{href:'' } Site terms & conditions - | - %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank" } Open Source & developer info on Github - - // To be added when Guy's pretty landing page is up: - //| - //%a{href:'' } Developers + %p + %small + %a{href:'' } Site terms & conditions + | + %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank" } Open Source & developer info on Github + + // To be added when Guy's pretty landing page is up: + //| + //%a{href:'' } Developers