From 3a04ccb52ce295a792f7025f8439d9cd40c8f157 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 8 May 2014 16:41:18 +1000 Subject: [PATCH] Menu styling for mobile menu --- .../stylesheets/darkswarm/menu.css.sass | 5 +++- app/views/shared/menu/_mobile_menu.html.haml | 29 ++++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index bbe9bebdb6..9ffb810ac2 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -26,4 +26,7 @@ nav.top-bar a.icon i @media screen and (min-width: 1025px) body.off-canvas padding-top: 45px - +@media screen and (max-width: 1025px) + section.right + .nav-branded + padding: 0 1em \ No newline at end of file diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index fa90de20e7..203a72d41a 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -1,9 +1,9 @@ %nav.tab-bar.show-for-medium-down - %section.left-small + %section.left %a.left-off-canvas-toggle.menu-icon - %span - %section.right-small - %a.icon{href: cart_url} + %span + %section.right + %a.nav-branded.icon{href: cart_url} %i.fi-shopping-cart %span = cart_count @@ -14,6 +14,17 @@ %aside.left-off-canvas-menu.show-for-medium-down %ul.off-canvas-list %li= link_to image_tag("ofn_logo_small.png"), root_path + + - if spree_current_user.andand.has_spree_role? 'admin' + %li + %a{href: spree_admin_path} + %span.nav-primary Admin + %li + - if spree_current_user.nil? + = render 'shared/signed_out' + - else + = render 'shared/signed_in' + %li %a{href: main_app.producers_path} Producers @@ -38,12 +49,4 @@ %a{href: ""} %span.nav-primary Groups - - if spree_current_user.andand.has_spree_role? 'admin' - %li - %a{href: spree_admin_path} - %span.nav-primary Admin - %li - - if spree_current_user.nil? - = render 'shared/signed_out' - - else - = render 'shared/signed_in' +