From 5cf0a3adb0eb1f4809fdea4efe80492df4cf085d Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 13 Feb 2019 19:30:28 +0100
Subject: [PATCH] Add the missing right hand side margin for name fields

---
 .../src/less/components/editor.less           | 24 ++++++++++++-------
 .../editor/umb-editor-content-header.html     |  6 ++---
 .../components/editor/umb-editor-header.html  |  6 ++---
 3 files changed, 22 insertions(+), 14 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 f165c0c865..b1716de86c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -63,14 +63,14 @@
 // header
 
 .umb-editor-header {
-	background: @white;
-	position: absolute;
-	padding-left: 20px;
-	z-index: @zIndexEditor;
-	border-bottom: 1px solid @gray-9;
-	width: 100%;
-	box-sizing: border-box;
-	height: @editorHeaderHeight;
+    background: @white;
+    position: absolute;
+    padding-left: 20px;
+    z-index: @zIndexEditor;
+    border-bottom: 1px solid @gray-9;
+    width: 100%;
+    box-sizing: border-box;
+    height: @editorHeaderHeight;
 }
 
 .umb-editor-header__back {
@@ -84,6 +84,14 @@
 	display: flex;
 }
 
+.umb-editor-header__name-and-description {
+    margin-right: 20px;
+}
+
+.-split-view-active .umb-editor-header__name-and-description {
+    margin-right: 0;
+}
+
 .umb-editor-header__name-wrapper ng-form {
 	flex: 1 1 auto;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 98ecfd4d28..09d46fcf4c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -1,4 +1,4 @@
-<div data-element="editor-header" class="umb-editor-header">
+<div data-element="editor-header" class="umb-editor-header" ng-class="{'-split-view-active': splitViewOpen === true}">
 
     <div class="flex items-center" style="height: 100%;">
 
@@ -10,7 +10,7 @@
 
         <div class="flex items-center" style="flex: 1;">
 
-            <div id="nameField" style="flex: 1 1 auto;">
+            <div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
                 <div class="umb-editor-header__name-wrapper">
                     <ng-form name="headerNameForm">
                         <input
@@ -60,7 +60,7 @@
             </a>
         </div>
 
-        <div ng-if="content.apps && splitViewOpen !== true" style="margin-left: 20px;">
+        <div ng-if="content.apps && splitViewOpen !== true">
             <umb-editor-navigation
                 data-element="editor-sub-views"
                 navigation="content.apps"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 1023953ce0..7ca04b822f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -1,4 +1,4 @@
-<div data-element="editor-header" class="umb-editor-header">
+<div data-element="editor-header" class="umb-editor-header" ng-class="{'-split-view-active': splitViewOpen === true}">
 
     <div class="flex items-center" style="height: 100%;">
 
@@ -20,7 +20,7 @@
                 </div>
             </ng-form>
 
-            <div id="nameField" style="flex: 1 1 auto;">
+            <div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
                 <div class="umb-editor-header__name-wrapper">
                     <ng-form name="headerNameForm">
                         <input data-element="editor-name-field"
@@ -69,7 +69,7 @@
 
         </div>
 
-        <div ng-if="navigation && splitViewOpen !== true" style="margin-left: 20px;">
+        <div ng-if="navigation && splitViewOpen !== true">
             <umb-editor-navigation
                 data-element="editor-sub-views"
                 navigation="navigation"