Merge branch 'master' into ci/commit-lint

uPortal-Attic · Oct 18, 2017 · a2d93b3 · a2d93b3
2 parents 4cea64d + 2143eeb
commit a2d93b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/components/css/buckyless/header.less b/components/css/buckyless/header.less
@@ -44,19 +44,6 @@ portal-header {
       max-height: 56px;
       overflow-y: hidden;
 
-      .title-link {
-        h1 {
-          @media (min-width: @xs) and (max-width: @sm) {
-            margin-left: 16px;
-          }
-        }
-
-        img {
-          height: 56px;
-          margin-right: 8px;
-        }
-      }
-
       .md-menu {
         > .md-button {
           min-width: 48px;
@@ -67,6 +54,20 @@ portal-header {
       .menu-toggle.md-button {
         min-width: 48px;
         margin: 0;
+
+        ~ .title-link h1 {
+          @media (min-width: @xs) {
+            margin-left: 0;
+          }
+        }
+
+        &.hide-gt-xs {
+          ~ .title-link h1 {
+            @media (min-width: @xs) {
+              margin-left: 16px;
+            }
+          }
+        }
       }
 
       .top-bar-controls-xs {

diff --git a/components/css/buckyless/widget.less b/components/css/buckyless/widget.less
@@ -118,7 +118,7 @@
     width: 100%;
     height: 100%;
     background: rgba(0, 0, 0, 0.5);
-    z-index: 78;
+    z-index: 60;
     border-radius: 3px;
     top: 0;
 

diff --git a/components/portal/main/partials/header.html b/components/portal/main/partials/header.html
@@ -26,7 +26,7 @@
       <!-- MAIN MENU TOGGLE -->
       <md-button class="menu-toggle" ng-controller="MainMenuController as vm" ng-click="vm.showMainMenu()" ng-class="{ 'hide-gt-xs' : vm.hideMainMenu }">
         <md-icon>menu</md-icon>
-        <md-tooltip md-direction="bottom" md-delay="500" class="top-bar-tooltip">Menu</md-tooltip>
+        <md-tooltip md-direction="bottom" md-delay="500" md-autohide class="top-bar-tooltip">Menu</md-tooltip>
         <notifications-bell mode="mobile-bell" ng-if="!GuestMode" hide-gt-xs></notifications-bell>
       </md-button>