From c615a805f3f4b1cba39af17d0aa7989d66de963e Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 29 Apr 2014 11:45:08 +1000 Subject: [PATCH] More styling for active table so nodes which are inactive have different interactive states --- .../stylesheets/darkswarm/hub_node.css.sass | 24 +++++++++++++++---- app/views/modals/_food_hub.html.haml | 2 +- app/views/modals/_learn_more.html.haml | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index 5ade3e7756..eabe9a2847 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -11,9 +11,6 @@ hub &, & > a.row display: block - &.inactive, &.inactive strong - color: $disabled-dark - &.open .active_table_row:first-child @include csstrans @@ -61,7 +58,26 @@ hub background-color: rgba(255,255,255,0.2) border: 1px solid $clr-strong color: $clr-strong - + + &.inactive, &.inactive strong + color: $disabled-dark + &.closed + &:hover, &:active, &:focus + border: 1px solid $disabled-dark + color: $disabled-dark + &.open + .active_table_row:first-child + color: $dark-grey + border-top: 1px solid $disabled-dark + border-left: 1px solid $disabled-dark + border-right: 1px solid $disabled-dark + strong + color: $dark-grey + .active_table_row:nth-child(2) + border-left: 1px solid $disabled-dark + border-right: 1px solid $disabled-dark + border-bottom: 1px solid $disabled-dark + &.current &, & * color: $clr-strong \ No newline at end of file diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml index 2143d8d761..ceba6192f3 100644 --- a/app/views/modals/_food_hub.html.haml +++ b/app/views/modals/_food_hub.html.haml @@ -1,4 +1,4 @@ %h2 Food Hubs %h5 Our food hubs are the point of contact between you and the people who make your food! -%p You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. +%p You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. %a.close-reveal-modal{"ng-click" => "cancel()"} × \ No newline at end of file diff --git a/app/views/modals/_learn_more.html.haml b/app/views/modals/_learn_more.html.haml index a34395a751..1cfdaf6c00 100644 --- a/app/views/modals/_learn_more.html.haml +++ b/app/views/modals/_learn_more.html.haml @@ -2,7 +2,7 @@ %h5 Shop the Open Food Network %p Search for a food hub near you to start shopping! You can expand each food hub to see what kinds of goodies are available, and click through to start shopping. %h5 Pick-ups, delivery & shipping costs -%p Some food hubs deliver to your door, while others require you to pick-up your purchases. You can see which options are available on the homepage, and select which you'd like at the shopping and check-out pages. Delivery will cost more, and pricing differs from hub-to-hub. +%p Some food hubs deliver to your door, while others require you to pick-up your purchases. You can see which options are available on the homepage, and select which you'd like at the shopping and check-out pages. Delivery will cost more, and pricing differs from hub-to-hub. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. %h5 Learn more %p If you want to learn more about the Open Food Network, how it works, and get involved, check out: %a.button.neutral-btn.dark{:href => "http://www.openfoodnetwork.org" , :target => "_blank" } Open Food Network