From 1de2d536c201459350d67875463d2ebca4553233 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 8 Feb 2018 20:30:26 +0100
Subject: [PATCH] fixes styling of fixed header

---
 .../src/less/components/editor.less                  |  6 ++++--
 .../editor/subheader/umb-editor-sub-header.less      | 12 ++++++------
 .../views/components/application/umb-navigation.html |  2 ++
 .../src/views/propertyeditors/grid/grid.html         |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 285dd219af..90d1ff8e80 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -68,7 +68,8 @@
 	position: absolute;
 	padding: 0 20px;
 	z-index: 1;
-	box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.16);
+	// box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.16);
+	border-bottom: 1px solid @gray-9;
 	width: 100%;
 	box-sizing: border-box;
 	height: @editorHeaderHeight;
@@ -233,7 +234,8 @@ a.umb-editor-header__close-split-view:hover {
 	height: @editorFooterHeight;
 	padding: 10px 20px;
 	background: @white;
-	box-shadow: 0 -1px 3px 0 rgba(0, 0, 0, 0.16);
+	// box-shadow: 0 -1px 3px 0 rgba(0, 0, 0, 0.16);
+	border-top: 1px solid @gray-9;
 	z-index: 1;
 	bottom: 0;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 6a19a4ca3d..26e0e5fee1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -1,5 +1,5 @@
 .umb-editor-sub-header {
-   padding: 15px 0;
+   padding: 10px 0;
    margin-bottom: 10px;
    background: @gray-10;
    display: flex;
@@ -10,11 +10,11 @@
 }
 
 .umb-editor-sub-header.-umb-sticky-bar {
-   box-shadow: 0 5px 0 rgba(0, 0, 0, 0.08), 0 1px 0 rgba(0, 0, 0, 0.16);
-   transition: box-shadow 1s;
-   top: 100px; /* height of header */
-   margin-top: 0;
-   margin-bottom: 0;
+    box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
+    transition: box-shadow 1s;
+    top: calc(@appHeaderHeight + @editorHeaderHeight);
+    margin-top: 0;
+    margin-bottom: 0;
 }
 
 .umb-group-builder__property-preview .umb-editor-sub-header {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
index 88f1f14224..46dbff4bbc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
@@ -5,6 +5,7 @@
 
         <div ng-swipe-left="nav.hideNavigation()" class="navigation-inner-container">
 
+            <!--
             <div ng-if="currentSection === 'content'" class="umb-language-picker" on-outside-click="open = false;" bind-click-on="{{open === true}}">
                 
                 <div class="umb-language-picker__toggle" ng-click="test()">
@@ -19,6 +20,7 @@
                     <a href="">German (Germany)</a>
                 </div>
             </div>
+            -->
 
             <!-- the tree -->
             <div id="tree" ng-if="authenticated">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index c2513b9760..fd81d94f94 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-editor clearfix" id="umb-grid">
 
-    <umb-editor-sub-header>
+    <umb-editor-sub-header style="background-color: white;">
 
         <umb-editor-sub-header-content-right>
             <umb-button