From c97ed026d01cb7ea48155f292115581689ddc678 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 26 Jun 2015 10:49:02 +1000
Subject: [PATCH] Make room in menu for shopping@ text

---
 app/assets/stylesheets/darkswarm/menu.css.sass      | 6 +++---
 app/assets/stylesheets/darkswarm/variables.css.sass | 2 +-
 app/views/shared/menu/_large_menu.html.haml         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass
index 672dded1aa..d92fac2d06 100644
--- a/app/assets/stylesheets/darkswarm/menu.css.sass
+++ b/app/assets/stylesheets/darkswarm/menu.css.sass
@@ -28,7 +28,7 @@ nav
 
   // Default overrides - big menu
   .top-bar-section .has-dropdown > a
-    padding-right: $topbar-height / 2 !important
+    padding-right: $topbar-height / 3 !important
 
     i.ofn-i_022-cog
       font-size: 24px
@@ -113,10 +113,10 @@ nav
 
 // Responsive
 
-@media screen and (max-width: 1350px)
+@media screen and (max-width: 1450px)
   nav .top-bar-section
     ul li a, .has-dropdown > a
-      padding: 0 $topbar-height / 4 !important
+      padding: 0 $topbar-height / 8 !important
 
     ul.center
       margin-left: -24px
diff --git a/app/assets/stylesheets/darkswarm/variables.css.sass b/app/assets/stylesheets/darkswarm/variables.css.sass
index 6a9828951a..81018be6ec 100644
--- a/app/assets/stylesheets/darkswarm/variables.css.sass
+++ b/app/assets/stylesheets/darkswarm/variables.css.sass
@@ -5,7 +5,7 @@ $australia-orange: rgba(242, 112, 82, 1)
 
 // Topbar
 $topbar-height: rem-calc(75)
-$topbar-link-padding: $topbar-height / 2
+$topbar-link-padding: $topbar-height / 3
 
 $topbar-bg: $white
 $topbar-bg-color: $topbar-bg
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index bf4e14d871..97a815a27a 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -29,6 +29,6 @@
       %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true}
         %a{href: main_app.shop_path}
           %em Shopping &#64;
-          %span.nav-primary.nav-branded {{ CurrentHub.hub.name }}
+          %span.nav-primary.nav-branded {{ CurrentHub.hub.name | truncate:25 }}
       %li.cart{"ng-cloak" => true}
         = render partial: "shared/menu/cart"