diff --git a/app/assets/images/logo-australia.png b/app/assets/images/logo-australia.png index f0f460917a..46b8ef071a 100644 Binary files a/app/assets/images/logo-australia.png and b/app/assets/images/logo-australia.png differ diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index f4c8f6aa04..560e78e5a4 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -4,10 +4,21 @@ @import typography @import variables + nav @include textpress text-shadow: none + // Create center style for nav ul (foundation provides left and right) + text-align: center + .top-bar-section + ul.center + display: inline-block + // By default, we center between the left and right uls, but we want to be centered + // relative to the whole page. The difference in width between the other uls is 74px, + // so we offset by that amount here. + margin-left: -74px + .joyride-tip-guide .button text-shadow: none diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 6534e78c06..084049b100 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -1,11 +1,12 @@ %nav.top-bar.show-for-large-up{'data-topbar' => true} %section.top-bar-section - %ul.left{} + %ul.left %li.ofn-logo %a{href: root_path} -# TODO: SVGify (though this image is double-size for retina) - %img{src: "/assets/logo-australia.png", width: "269", height: "45"} + %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 @@ -26,7 +27,6 @@ %a{href: ContentConfig.footer_about_url} %span.nav-primary About %li.divider - %section.top-bar-section %ul.right %li.divider - if spree_current_user.nil?