From 0451dbe6b0758da98cc267d72c2233d02674b3af Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 9 Jul 2014 16:55:05 +1000 Subject: [PATCH] More styling to filters and search --- app/assets/stylesheets/darkswarm/active_table.css.sass | 5 ++++- app/views/producers/_filters.html.haml | 10 ++++++++-- app/views/producers/index.html.haml | 10 +++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/active_table.css.sass b/app/assets/stylesheets/darkswarm/active_table.css.sass index b472c36915..a386328a5a 100644 --- a/app/assets/stylesheets/darkswarm/active_table.css.sass +++ b/app/assets/stylesheets/darkswarm/active_table.css.sass @@ -9,6 +9,9 @@ display: block &:first-child cursor: pointer + + .no-results + font-size: 1.875rem .active_table .active_table_node display: block @@ -18,7 +21,7 @@ border: 1px solid transparent &, & > a.row display: block - + .active_table_row.link border: 0 diff --git a/app/views/producers/_filters.html.haml b/app/views/producers/_filters.html.haml index b46df416c3..01364baf1a 100644 --- a/app/views/producers/_filters.html.haml +++ b/app/views/producers/_filters.html.haml @@ -27,5 +27,11 @@ .small-12.large-6.columns %shipping-type-selector{results: "shippingTypes"} -.row.animate-show{"ng-show" => "filtersActive"} - %a{"ng-click" => "clearAll()"} Clear all + .row.filter-box.animate-show{"ng-show" => "filtersActive && totalActive() > 0"} + .small-12.columns + %a.button.secondary.small.expand{"ng-click" => "clearAll()"} + %i.ofn-i_009-close + Clear all filters + +/ .row.animate-show{"ng-show" => "filtersActive"} +/ %a{"ng-click" => "clearAll()"} Clear all diff --git a/app/views/producers/index.html.haml b/app/views/producers/index.html.haml index 5cde408aba..5b5c6f27ac 100644 --- a/app/views/producers/index.html.haml +++ b/app/views/producers/index.html.haml @@ -1,5 +1,5 @@ = inject_enterprises -.producers{"ng-controller" => "ProducersCtrl"} +.producers.pad-top{"ng-controller" => "ProducersCtrl"} .row .small-12.columns.pad-top %h1 Find local producers @@ -35,7 +35,11 @@ .small-12.columns = render partial: 'producers/skinny' = render partial: 'producers/fat' - %producer.active_table_node.row{"ng-show" => "producers.length == 0"} - No Results + + %producer.row{"ng-show" => "producers.length == 0"} + %p.no-results + Sorry, no results found for + %strong {{query}}. + Try another search? = render partial: "shared/footer"