From fc07169b5caca7ad0037aa9bf38633a329e34a48 Mon Sep 17 00:00:00 2001
From: Joe Fiorini <joe@joefiorini.com>
Date: Thu, 28 May 2015 18:09:51 -0400
Subject: [PATCH] Fix mobile menu styles for portal mode

---
 awx/ui/static/js/main-menu/main-menu.block.less      | 5 +++++
 awx/ui/static/js/main-menu/main-menu.partial.html    | 4 ++--
 awx/ui/static/js/main-menu/menu-default.partial.html | 2 +-
 awx/ui/static/js/main-menu/menu-item.block.less      | 3 +++
 awx/ui/static/js/main-menu/menu-portal.partial.html  | 1 +
 awx/ui/static/js/main-menu/menu-toggle.block.less    | 1 +
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/awx/ui/static/js/main-menu/main-menu.block.less b/awx/ui/static/js/main-menu/main-menu.block.less
index 1adac872da..d89e5aaeb9 100644
--- a/awx/ui/static/js/main-menu/main-menu.block.less
+++ b/awx/ui/static/js/main-menu/main-menu.block.less
@@ -19,6 +19,10 @@
         // border-bottom: solid thin black;
     }
 
+    &--portal.Menu--open {
+        height: 290px !important;
+    }
+
   }
 
   @media screen and (min-width: 571px) {
@@ -33,6 +37,7 @@
     @media screen and (min-width: 571px) {
       display: none;
     }
+    display: flex;
     margin-left: auto;
   }
 
diff --git a/awx/ui/static/js/main-menu/main-menu.partial.html b/awx/ui/static/js/main-menu/main-menu.partial.html
index 5f87df2245..4fc142f685 100644
--- a/awx/ui/static/js/main-menu/main-menu.partial.html
+++ b/awx/ui/static/js/main-menu/main-menu.partial.html
@@ -1,5 +1,5 @@
-<nav class="MainMenu MainMenu--fixedTop" ng-switch="$eval(menuStyle)">
-    <a link-to="dashboard" class="MenuItem MenuItem--logo">
+<nav class="MainMenu MainMenu--fixedTop" ng-class="menuStyleClassName" ng-switch="$eval(menuStyle)">
+    <a link-to="dashboard" menu-item class="MenuItem MenuItem--logo">
         <img id="ansible-brand-logo" alt="Ansible Tower" class="MenuItem-logo" src="/static/img/TowerLogo.svg">
         <menu-toggle-button width="15" height="15" bar-height="2" class="MainMenu-toggle"></menu-toggle-button>
     </a>
diff --git a/awx/ui/static/js/main-menu/menu-default.partial.html b/awx/ui/static/js/main-menu/menu-default.partial.html
index dd41902ca4..eb0666662f 100644
--- a/awx/ui/static/js/main-menu/menu-default.partial.html
+++ b/awx/ui/static/js/main-menu/menu-default.partial.html
@@ -24,7 +24,7 @@
   </i>
   <span class="MenuItem-helpTitle">Setup</span>
 </a>
-<a link-to="portal" class="MenuItem MenuItem--fixed">
+<a link-to="portal" menu-item class="MenuItem MenuItem--fixed">
   <i class="MenuItem-icon" title="Portal Mode" data-placement="bottom">
     <aw-icon name="PortalMode"></aw-icon>
     <!-- <img src="/static/img/PortalMode.svg" title="Portal Mode" data-placement="bottom" class="MenuItem-icon"> -->
diff --git a/awx/ui/static/js/main-menu/menu-item.block.less b/awx/ui/static/js/main-menu/menu-item.block.less
index 00bea5ddcb..a6f05181f2 100644
--- a/awx/ui/static/js/main-menu/menu-item.block.less
+++ b/awx/ui/static/js/main-menu/menu-item.block.less
@@ -39,6 +39,8 @@
 
     &--logo {
         border: none;
+        display: flex;
+        align-items: stretch;
     }
   }
 
@@ -96,6 +98,7 @@
   &-logo {
     height: 34px;
     width: auto;
+    align-self: center;
   }
 
   &-icon {
diff --git a/awx/ui/static/js/main-menu/menu-portal.partial.html b/awx/ui/static/js/main-menu/menu-portal.partial.html
index fad3e9d74d..0269647dfb 100644
--- a/awx/ui/static/js/main-menu/menu-portal.partial.html
+++ b/awx/ui/static/js/main-menu/menu-portal.partial.html
@@ -13,6 +13,7 @@
   <i class="MenuItem-icon" title="Exit Portal Mode" data-placement="bottom">
     <aw-icon name="PortalMode--exit"></aw-icon>
   </i>
+  <span class="MenuItem-helpTitle">Exit Portal Mode</span>
 </a>
 <a link-to="signOut" class="MenuItem MenuItem--fixed">
   <i class="MenuItem-icon" title="Sign Out" data-placement="bottom">
diff --git a/awx/ui/static/js/main-menu/menu-toggle.block.less b/awx/ui/static/js/main-menu/menu-toggle.block.less
index cecd6f15bc..4c8691b97e 100644
--- a/awx/ui/static/js/main-menu/menu-toggle.block.less
+++ b/awx/ui/static/js/main-menu/menu-toggle.block.less
@@ -2,6 +2,7 @@
 
 .MenuToggle {
 
+    align-self: center;
     &-icon {
         // Override settings (on svg tag) from nv.d3.css that really
         // shouldn't be there, but are, so meh.