From e0870ef6dcde22dc53d22936982f383ff6a299c8 Mon Sep 17 00:00:00 2001
From: Robb Hamilton <rhamilto@redhat.com>
Date: Wed, 25 Oct 2017 14:36:18 -0400
Subject: [PATCH] Only transition vertical nav if project bar exists

Fixes #2291
---
 app/styles/_layouts.less      | 4 +++-
 app/styles/_vertical-nav.less | 2 +-
 dist/styles/main.css          | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/styles/_layouts.less b/app/styles/_layouts.less
index 95165040c4..e71a7b58c7 100644
--- a/app/styles/_layouts.less
+++ b/app/styles/_layouts.less
@@ -25,7 +25,6 @@
   }
   .container-pf-nav-pf-vertical {
     height: 100%;
-    transition: margin-left .1s ease-in-out;
     &,
     &.collapsed-nav {
       margin-left: 0; // override PatternFly default
@@ -37,6 +36,9 @@
       height: 100%;
     }
   }
+  .has-project-bar .container-pf-nav-pf-vertical {
+    transition: margin-left .1s ease-in-out;
+  }
 }
 .surface-shaded {
   background-color: @panel-shaded;
diff --git a/app/styles/_vertical-nav.less b/app/styles/_vertical-nav.less
index 2e2e341c24..97819754d1 100644
--- a/app/styles/_vertical-nav.less
+++ b/app/styles/_vertical-nav.less
@@ -5,13 +5,13 @@
 .nav-pf-vertical {
   background-color: @nav-pf-vertical-bg-color;
   top: @navbar-os-header-height-mobile;
-  transition: width .1s ease-in-out, left .1s ease-in-out;
   z-index: 990;
   @media(min-width: @screen-sm-min) {
     // Hide at wider screen widths unless there is a project.
     display: none;
   }
   .has-project-bar & {
+    transition: width .1s ease-in-out, left .1s ease-in-out;
     top: (@navbar-os-header-height-mobile + @project-bar-height-mobile);
     @media(min-width: @screen-sm-min) {
       display: block;
diff --git a/dist/styles/main.css b/dist/styles/main.css
index bbbea99a99..06f16a2b8e 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -4909,6 +4909,7 @@ pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 }
 .layout-pf.layout-pf-fixed{height:1px}
 .layout-pf.layout-pf-fixed body{height:1px;padding-top:41px}
+.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical,.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical .view{height:100%}
 @media (min-width:768px){.data-toolbar .data-toolbar-filter{flex:1 1 0%}
 .data-toolbar .vertical-divider+.data-toolbar-filter{margin-top:0}
 .layout-pf.layout-pf-fixed body{padding-top:61px}
@@ -4918,10 +4919,9 @@ pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 .layout-pf.layout-pf-fixed body.has-project-bar .container-pf-nav-pf-vertical{margin-left:220px}
 .layout-pf.layout-pf-fixed body.has-project-bar .container-pf-nav-pf-vertical.collapsed-nav{margin-left:75px}
 }
-.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical{height:100%;transition:margin-left .1s ease-in-out}
 .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical,.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical.collapsed-nav{margin-left:0}
 .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical .middle-header{margin-bottom:20px}
-.layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical .view{height:100%}
+.layout-pf.layout-pf-fixed .has-project-bar .container-pf-nav-pf-vertical{transition:margin-left .1s ease-in-out}
 .surface-shaded{background-color:#ededed;min-height:100%}
 .list-pf-actions .actions-dropdown-kebab{font-size:18px;margin-right:-5px}
 .list-pf-actions .dropdown .btn-link{color:#252525;font-size:17px;line-height:1;padding:4px 10px;margin-left:-10px;margin-right:-10px}
@@ -5758,8 +5758,8 @@ alerts+.chromeless .log-loading-msg{margin-top:130px}
 .appended-icon{display:inline-block}
 .block{display:block}
 .text-prepended-icon{align-items:baseline;display:flex}
-.nav-pf-vertical{background-color:#292e34;top:41px;transition:width .1s ease-in-out,left .1s ease-in-out;z-index:990}
-.has-project-bar .nav-pf-vertical{top:69px}
+.nav-pf-vertical{background-color:#292e34;top:41px;z-index:990}
+.has-project-bar .nav-pf-vertical{transition:width .1s ease-in-out,left .1s ease-in-out;top:69px}
 @media (min-width:768px){.nav-pf-vertical{display:none}
 .has-project-bar .nav-pf-vertical{display:block;top:101px}
 }