From 9b8a30e73bd013440c1cffca3a9fb16da90d0885 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 29 Aug 2018 12:23:38 +0200
Subject: [PATCH] align language picker with editor header

---
 .../less/components/application/umb-language-picker.less    | 6 +++++-
 src/Umbraco.Web.UI.Client/src/less/tree.less                | 1 +
 src/Umbraco.Web.UI.Client/src/less/variables.less           | 2 +-
 .../src/views/components/tree/umb-tree.html                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index 5cf9ca21b3..1ad72c16b6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -1,6 +1,10 @@
 .umb-language-picker {
     position: relative;
     z-index: @zindexDropdown;
+    // When the language dropdown is present adjust height on the tree root
+    ~ #tree .umb-tree-root {
+        height: auto;
+    }
 }
 
 .umb-language-picker__toggle {
@@ -10,7 +14,7 @@
     padding: 0 20px;
     cursor: pointer;
     border-bottom: 1px solid @gray-9;
-    height: 50px;
+    height: @editorHeaderHeight;
     box-sizing: border-box;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index cf163cd72d..7cf7e6e5ab 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -55,6 +55,7 @@
 
 .umb-tree li.root > div:first-child {
   padding: 0;
+  height: @editorHeaderHeight;
 }
 
 .umb-tree li.root > div h5, .umb-tree li.root > div h6 {
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index c6e87a74fe..e6512aa9e5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -195,7 +195,7 @@
 @bodyBackground:        @gray-10;
 @textColor:             @gray-2;
 
-@editorHeaderHeight:    80px;
+@editorHeaderHeight:    70px;
 @editorFooterHeight:    50px;
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
index a2caa245ad..ad52a6cef5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
@@ -1,6 +1,6 @@
 <ul class="umb-tree" ng-class="{'hide-options': hideoptions === 'true'}">
     <li class="root">
-        <div data-element="tree-root" ng-class="getNodeCssClass(tree.root)" ng-hide="hideheader" on-right-click="altSelect(tree.root, $event)">
+        <div data-element="tree-root" class="umb-tree-root" ng-class="getNodeCssClass(tree.root)" ng-hide="hideheader" on-right-click="altSelect(tree.root, $event)">
             <h5>
                 <a ng-href="#/{{section}}" ng-click="select(tree.root, $event)" class="root-link">
                     <i ng-if="enablecheckboxes === 'true'" ng-class="selectEnabledNodeClass(tree.root)"></i>