diff --git a/app/assets/javascripts/templates/map_modal_hub.html.haml b/app/assets/javascripts/templates/map_modal_hub.html.haml index e201ceb37e..6e390155c9 100644 --- a/app/assets/javascripts/templates/map_modal_hub.html.haml +++ b/app/assets/javascripts/templates/map_modal_hub.html.haml @@ -36,7 +36,7 @@ %i.ofn-i_039-delivery Delivery .row - .small-12.large-12.columns + .columns.small-12 %a.button.hub.expand{"bo-href" => "enterprise.path", "ng-class" => "{primary: enterprise.active, secondary: !enterprise.active}", "ofn-empties-cart" => "enterprise"} diff --git a/app/assets/stylesheets/darkswarm/active_table.css.sass b/app/assets/stylesheets/darkswarm/active_table.css.sass index b56ac17590..57c28f3d3e 100644 --- a/app/assets/stylesheets/darkswarm/active_table.css.sass +++ b/app/assets/stylesheets/darkswarm/active_table.css.sass @@ -20,6 +20,9 @@ border: 1px solid transparent &, & > a.row display: block + + .active_table_row.link + border: 0 &.open .active_table_row:first-child @@ -38,24 +41,25 @@ .active_table_row:nth-child(2) border-left: 1px solid $dark-grey border-right: 1px solid $dark-grey - border-bottom: 1px solid $dark-grey border-top: none background-color: rgba(255,255,255,0.2) .active_table_row.link @include csstrans padding: 0 - background-color: $dark-grey -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.35) box-shadow: 0 1px 1px 0 rgba(0,0,0,0.35) - &:hover - background-color: $disabled-dark - a - display: block - padding: 0.8em 0.5em - margin: 0 -0.9375rem - &, & * - color: white + border-left: 1px solid $dark-grey + border-right: 1px solid $dark-grey + border-bottom: 1px solid $dark-grey + // &:hover + // background-color: $disabled-dark + // a + // display: block + // padding: 0.8em 0.5em + // margin: 0 -0.9375rem + // &, & * + // color: white p padding-top: 1em diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index d13831661b..1c1fed4a86 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -27,7 +27,7 @@ border-left: 1px solid $disabled-dark border-right: 1px solid $disabled-dark border-bottom: 1px solid $disabled-dark - + //Closed row &.closed &:hover, &:active, &:focus @@ -47,11 +47,11 @@ .active_table_row:nth-child(2) border-left: 1px solid $clr-brick border-right: 1px solid $clr-brick - border-bottom: 1px solid $clr-brick .active_table_row.link - background-color: $clr-brick - &:hover - background-color: $clr-brick-bright + border-left: 1px solid $clr-brick + border-right: 1px solid $clr-brick + border-bottom: 1px solid $clr-brick + //Current selected row &.current diff --git a/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass b/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass index 378c4ac1a2..a9b5cae2a1 100644 --- a/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass +++ b/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass @@ -87,8 +87,12 @@ float: left margin-right: 0.5rem - - +.active_table_row + .cta-container + padding-bottom: 0.75rem + padding-top: 0.5rem + .button.hub + margin-bottom: 0.25rem // Generic styles for use diff --git a/app/assets/stylesheets/darkswarm/producer_node.css.sass b/app/assets/stylesheets/darkswarm/producer_node.css.sass index a926526397..55a0ec0f77 100644 --- a/app/assets/stylesheets/darkswarm/producer_node.css.sass +++ b/app/assets/stylesheets/darkswarm/producer_node.css.sass @@ -16,11 +16,10 @@ .active_table_row:nth-child(2) border-left: 1px solid $clr-turquoise border-right: 1px solid $clr-turquoise - border-bottom: 1px solid $clr-turquoise .active_table_row.link - background-color: $clr-turquoise - &:hover - background-color: $clr-turquoise-bright + border-left: 1px solid $clr-turquoise + border-right: 1px solid $clr-turquoise + border-bottom: 1px solid $clr-turquoise //Closed row &.closed diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml index a15ecd1e14..b70e195fa1 100644 --- a/app/views/home/_fat.html.haml +++ b/app/views/home/_fat.html.haml @@ -25,16 +25,18 @@ = render partial: "modals/producer" .row.active_table_row.link{"ng-show" => "open()", "bo-if" => "hub.active"} - .columns.small-11 - %span{"active-table-hub-link" => "hub", change: "Change hub to", shop: "Shop at"} - %a.button.hub{"bo-href" => "hub.path", "ofn-empties-cart" => "hub", - "bo-class" => "{primary: hub.active, grey: !hub.active}"} - %i.ofn-i_033-open-sign{"bo-if" => "hub.active"} - %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"} - {{hub.name}} - ( {{ hub.address.city }} , {{hub.address.state}} ) - - .columns.small-1.text-right - %a{"bo-href" => "hub.path"} - %i.ofn-i_007-caret-right - + .cta-container.columns.small-12 + .row + .columns.small-12 + %h5 + %span{"active-table-hub-link" => "hub", change: "Change hub to", shop: "Shop at"} + .row + .columns.small-12 + %a.button.hub.expand{"bo-href" => "hub.path", + "ng-class" => "{primary: hub.active, secondary: !hub.active}", + "ofn-empties-cart" => "hub"} + %i.ofn-i_033-open-sign{"bo-if" => "hub.active"} + %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"} + {{hub.name}} + .button-address ({{ [hub.address.city, hub.address.state] | printArray }}) + %i.ofn-i_007-caret-right diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml index deb68d264e..8290e8195e 100644 --- a/app/views/producers/_fat.html.haml +++ b/app/views/producers/_fat.html.haml @@ -14,7 +14,7 @@ %a{"ng-repeat" => "hub in producer.hubs", "bo-href" => "hub.path", "ofn-empties-cart" => "hub", - "bo-class" => "{primary: hub.active, grey: !hub.active}"} + "bo-class" => "{primary: hub.active, secondary: !hub.active}"} %i.ofn-i_033-open-sign{"bo-if" => "hub.active"} %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"} {{hub.name}}