From 1090328a3cebb1dfab698b40e4d7c193abdab6a4 Mon Sep 17 00:00:00 2001 From: summerscope Date: Sat, 2 May 2015 20:12:33 +1000 Subject: [PATCH] Adding padding class and apply to templates to have required padding for new footer. --- app/assets/stylesheets/darkswarm/groups.css.sass | 2 -- app/assets/stylesheets/darkswarm/shop.css.sass | 1 - app/assets/stylesheets/darkswarm/typography.css.sass | 3 +++ app/views/checkout/edit.html.haml | 2 +- app/views/groups/index.html.haml | 2 +- app/views/groups/show.html.haml | 2 +- app/views/producers/index.html.haml | 2 +- app/views/shop/products/_form.html.haml | 2 +- app/views/spree/orders/edit.html.haml | 2 +- app/views/spree/orders/show.html.haml | 5 ++++- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/groups.css.sass b/app/assets/stylesheets/darkswarm/groups.css.sass index 3a74412711..931b7470a6 100644 --- a/app/assets/stylesheets/darkswarm/groups.css.sass +++ b/app/assets/stylesheets/darkswarm/groups.css.sass @@ -8,8 +8,6 @@ background-image: url("/assets/groups.svg") background-position: center 15px background-repeat: no-repeat - padding-bottom: 20px - a > .group-name &:hover, &:focus, &:active text-decoration: underline diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass index 9d38398f36..5422c4463a 100644 --- a/app/assets/stylesheets/darkswarm/shop.css.sass +++ b/app/assets/stylesheets/darkswarm/shop.css.sass @@ -12,7 +12,6 @@ @import shop-popovers .darkswarm - products display: block padding-top: 20px diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index 084624028a..97230d5b0a 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -105,6 +105,9 @@ ul.check-list .not-bold font-weight: normal +.footer-pad + padding-bottom: 100px + // These selectors match the default Foundation selectors // For clean overriden magic diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml index 2f30c93ba5..f5e70172c2 100644 --- a/app/views/checkout/edit.html.haml +++ b/app/views/checkout/edit.html.haml @@ -1,6 +1,6 @@ = inject_enterprises -.darkswarm +.darkswarm.footer-pad - content_for :order_cycle_form do %closing Checkout now diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index 262e188e3c..8a6fcbb64a 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -3,7 +3,7 @@ :javascript angular.module('Darkswarm').value('groups', #{render partial: "json/groups", object: @groups}) -#groups.pad-top{"ng-controller" => "GroupsCtrl"} +#groups.pad-top.footer-pad{"ng-controller" => "GroupsCtrl"} #active-table-search.row.pad-top .small-12.columns %h1 Groups / regions diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 1bc965dfb3..c825cbd9be 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -6,7 +6,7 @@ -# further hubs and producers of these enterprises can't be resoleved within this small subset = inject_json_ams "group_enterprises", @group.enterprises, Api::EnterpriseSerializer, active_distributors: @active_distributors -#group-page.row.pad-top{"ng-controller" => "GroupPageCtrl"} +#group-page.row.pad-top.footer-pad{"ng-controller" => "GroupPageCtrl"} .small-12.columns.pad-top %header .row diff --git a/app/views/producers/index.html.haml b/app/views/producers/index.html.haml index 0e46795701..125ac830e8 100644 --- a/app/views/producers/index.html.haml +++ b/app/views/producers/index.html.haml @@ -1,5 +1,5 @@ = inject_enterprises -.producers.pad-top{"ng-controller" => "EnterprisesCtrl"} +.producers.pad-top.footer-pad{"ng-controller" => "EnterprisesCtrl"} .row .small-12.columns.pad-top %h1 Find local producers diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index 0df4f022aa..f71a12163f 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -1,4 +1,4 @@ -%products.small-12.columns{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null", +%products.small-12.columns.footer-pad{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null", "infinite-scroll" => "incrementLimit()", "infinite-scroll-distance" => "1"} // TODO: Needs an ng-show to slide content down diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index 5f8186e568..adb6ef303a 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -13,7 +13,7 @@ = render partial: "shopping_shared/details" - %fieldset + %fieldset.footer-pad - if @order.line_items.empty? %div.row{"data-hook" => "empty_cart"} %p= t(:your_cart_is_empty) diff --git a/app/views/spree/orders/show.html.haml b/app/views/spree/orders/show.html.haml index 82120add82..4d538c9a18 100644 --- a/app/views/spree/orders/show.html.haml +++ b/app/views/spree/orders/show.html.haml @@ -11,7 +11,7 @@ = render "shopping_shared/details" - %fieldset#order_summary{"data-hook" => ""} + %fieldset#order_summary.footer-pad{"data-hook" => ""} .row .columns.large-12.text-center %h2 @@ -30,3 +30,6 @@ - unless params.has_key? :checkout_complete - if try_spree_current_user && respond_to?(:spree_account_path) = link_to t(:my_account), spree_account_path, :class => "button" + + += render partial: "shared/footer" \ No newline at end of file