diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index c726847ceb..1c02eac9aa 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -12,6 +12,10 @@ nav // Create center style for nav ul (foundation provides left and right) text-align: center .top-bar-section + // Avoid menu items blocking logo + li:not(.has-form), li:not(.has-form) a:not(.button), li:not(.has-form) a:not(.button):hover + background-color: transparent + ul.center display: inline-block // By default, we center between the left and right uls, but we want to be centered @@ -103,12 +107,24 @@ nav margin-right: 0.25rem + // Responsive +@media screen and (max-width: 1350px) + nav .top-bar-section + ul li a, .has-dropdown > a + padding: 0 $topbar-height / 4 !important + + ul.center + margin-left: -24px + + @media screen and (min-width: 1025px) body.off-canvas // padding required to placehold for fixed menu bar padding-top: $topbar-height + + @media screen and (max-width: 1025px) body.off-canvas // padding required to placehold for fixed menu bar diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 084049b100..bf4e14d871 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -5,39 +5,30 @@ %a{href: root_path} -# TODO: SVGify (though this image is double-size for retina) %img{src: "/assets/logo-australia.png", width: "250", height: "51"} - %li.divider %ul.center %li %a{href: main_app.shops_path} %span.nav-primary Shops - %li.divider %li %a{href: main_app.map_path} %span.nav-primary Map - %li.divider %li %a{href: main_app.producers_path} %span.nav-primary Producers - %li.divider %li %a{href: main_app.groups_path} %span.nav-primary Groups - %li.divider %li %a{href: ContentConfig.footer_about_url} %span.nav-primary About - %li.divider %ul.right - %li.divider - if spree_current_user.nil? = render 'shared/signed_out' - else = render 'shared/signed_in' - %li.divider %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true} %a{href: main_app.shop_path} %em Shopping @ %span.nav-primary.nav-branded {{ CurrentHub.hub.name }} - %li.divider %li.cart{"ng-cloak" => true} = render partial: "shared/menu/cart"