diff --git a/app/assets/stylesheets/darkswarm/active_table.css.sass b/app/assets/stylesheets/darkswarm/active_table.css.sass index c950cad28a..2023e24cca 100644 --- a/app/assets/stylesheets/darkswarm/active_table.css.sass +++ b/app/assets/stylesheets/darkswarm/active_table.css.sass @@ -84,6 +84,8 @@ border-right: 1px solid $disabled-dark strong color: $dark-grey + &:hover, &:active, &:focus + color: $dark-grey .active_table_row:nth-child(2) border-left: 1px solid $disabled-dark border-right: 1px solid $disabled-dark diff --git a/app/assets/stylesheets/darkswarm/home_panes.css.sass b/app/assets/stylesheets/darkswarm/home_panes.css.sass index 810aaf3b17..d2c83845d5 100644 --- a/app/assets/stylesheets/darkswarm/home_panes.css.sass +++ b/app/assets/stylesheets/darkswarm/home_panes.css.sass @@ -30,3 +30,9 @@ background-image: url("/assets/home/producers-bg.svg") background-repeat: no-repeat background-position: right center + +// Responsive +@media all and (max-width: 768px) + #map, #groups, #producers + .row + background-position: center center \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/tagline.css.sass b/app/assets/stylesheets/darkswarm/home_tagline.css.sass similarity index 63% rename from app/assets/stylesheets/darkswarm/tagline.css.sass rename to app/assets/stylesheets/darkswarm/home_tagline.css.sass index b8a0d7cec5..950a3c216d 100644 --- a/app/assets/stylesheets/darkswarm/tagline.css.sass +++ b/app/assets/stylesheets/darkswarm/home_tagline.css.sass @@ -2,7 +2,8 @@ @import mixins #tagline - background: black url("/assets/home/tagline-bg.jpg") + background-color: black + background-image: url("/assets/home/tagline-bg.jpg") @include fullbg height: 400px padding: 40px 0px diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index f24a5e6302..b68a1462d5 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -20,7 +20,6 @@ &:hover background-color: $clr-brick-bright - &.closed &:hover, &:active, &:focus border: 1px solid $clr-brick @@ -34,7 +33,3 @@ .active_table_row:first-child &, & * color: $clr-brick - - - - diff --git a/app/assets/stylesheets/darkswarm/hub_search.css.sass b/app/assets/stylesheets/darkswarm/hub_search.css.sass index d1b28f9ad1..6c608171ac 100644 --- a/app/assets/stylesheets/darkswarm/hub_search.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_search.css.sass @@ -3,7 +3,4 @@ #hub-search input font-size: 2em - @include big-input - //.advanced - //padding-top: 8px - //@include disabled + @include big-input \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index 1daabe34a5..1a3c81c478 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -5,7 +5,8 @@ border: 1px solid #999 font-size: 18px @extend .avenir - padding: 30px 20px + padding: 22px 18px + height: auto margin-bottom: 1em @mixin disabled diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index ddb4ab5324..29a0ee02b5 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -37,3 +37,4 @@ .neutral-btn.turquoise:hover, .neutral-btn.turquoise:active, .neutral-btn.turquoise:focus background-color: rgba(0, 0, 0, 0.1) text-shadow: 0 1px 0 #fff + diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml index ceba6192f3..e80ffe3745 100644 --- a/app/views/modals/_food_hub.html.haml +++ b/app/views/modals/_food_hub.html.haml @@ -1,4 +1,5 @@ %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. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. +%p You can only shop one food hub at a time. %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 1cfdaf6c00..870d5fe0bc 100644 --- a/app/views/modals/_learn_more.html.haml +++ b/app/views/modals/_learn_more.html.haml @@ -1,6 +1,6 @@ %h2 How it works %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. +%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. (You can only shop one food hub at a time.) %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. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. %h5 Learn more