diff --git a/app/assets/images/home/groups-bg.png b/app/assets/images/home/groups-bg.png index 53126f9686..140aed999c 100644 Binary files a/app/assets/images/home/groups-bg.png and b/app/assets/images/home/groups-bg.png differ diff --git a/app/assets/images/home/maps-bg.png b/app/assets/images/home/maps-bg.png index a354746209..ee5a7c8841 100644 Binary files a/app/assets/images/home/maps-bg.png and b/app/assets/images/home/maps-bg.png differ diff --git a/app/assets/images/home/producers-bg.png b/app/assets/images/home/producers-bg.png index b3f6b0d1a1..4564e74cb7 100644 Binary files a/app/assets/images/home/producers-bg.png and b/app/assets/images/home/producers-bg.png differ diff --git a/app/assets/images/home/shopping-bg.jpg b/app/assets/images/home/shopping-bg.jpg index a0662a04fe..0a02b0f6f4 100644 Binary files a/app/assets/images/home/shopping-bg.jpg and b/app/assets/images/home/shopping-bg.jpg differ diff --git a/app/assets/stylesheets/darkswarm/hub_search.css.sass b/app/assets/stylesheets/darkswarm/hub_search.css.sass index a66e32ae6c..d1b28f9ad1 100644 --- a/app/assets/stylesheets/darkswarm/hub_search.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_search.css.sass @@ -1,6 +1,9 @@ @import mixins #hub-search - .advanced - padding-top: 8px - @include disabled + input + font-size: 2em + @include big-input + //.advanced + //padding-top: 8px + //@include disabled diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index e978047de9..eef948bda3 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -5,8 +5,8 @@ border: 1px solid #999 font-size: 18px @extend .avenir - padding: 18px - margin-bottom: 1.25em + padding: 30px 20px + margin-bottom: 1em @mixin disabled color: $disabled-bright @@ -16,15 +16,20 @@ padding-bottom: 100px @mixin darkbg - background: $clr-brick + background-color: $clr-brick &, & * color: white @mixin lightbg - background: $clr-brick-ultra-light + background-color: $clr-brick-ultra-light &, & * color: black +@mixin turqbg + background-color: $clr-turquoise-light + &, & * + color: $clr-turquoise + @mixin fullbg background-position: center center background-repeat: no-repeat diff --git a/app/assets/stylesheets/darkswarm/panes.css.sass b/app/assets/stylesheets/darkswarm/panes.css.sass index f2cd34e99f..6a77b9131f 100644 --- a/app/assets/stylesheets/darkswarm/panes.css.sass +++ b/app/assets/stylesheets/darkswarm/panes.css.sass @@ -1,11 +1,32 @@ @import branding @import mixins + -#map, #producers, #groups, #beta - @include panepadding - -#map, #groups - @include darkbg - -#producers, #beta +#beta @include lightbg + .row + @include panepadding + +#map + @include darkbg + .row + @include panepadding + background-image: url("/assets/home/maps-bg.png") + background-repeat: no-repeat + background-position: left center + +#producers + @include turqbg + .row + @include panepadding + background-image: url("/assets/home/producers-bg.png") + background-repeat: no-repeat + background-position: right center + +#groups + @include darkbg + .row + @include panepadding + background-image: url("/assets/home/groups-bg.png") + background-repeat: no-repeat + background-position: left center diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index df95114e93..ddb4ab5324 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -30,4 +30,10 @@ border: 2px solid rgba(255, 255, 255, 0.8) text-shadow: 0 1px 0 $clr-brick +.neutral-btn.turquoise + border-color: $clr-turquoise + color: $clr-turquoise +.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/home/_producers.html.haml b/app/views/home/_producers.html.haml index 4b699b6086..7dca6143e2 100644 --- a/app/views/home/_producers.html.haml +++ b/app/views/home/_producers.html.haml @@ -5,6 +5,6 @@ %h2 Producers %h5 Looking for a specific producer or farmer? %p - %button.neutral-btn.dark + %button.neutral-btn.turquoise %i.fi-trees View all producers \ No newline at end of file