From f4df91aee71b3c43c3902969ccdc9632c41436c6 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Thu, 12 May 2022 16:03:36 +0100
Subject: [PATCH] Updated publishing flow

Refs https://github.com/TryGhost/Team/issues/1544
---
 ghost/admin/app/components/gh-date-time-picker.hbs |  6 +++---
 ghost/admin/app/styles/components/publishmenu.css  | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ghost/admin/app/components/gh-date-time-picker.hbs b/ghost/admin/app/components/gh-date-time-picker.hbs
index 244ee64222..60a411a987 100644
--- a/ghost/admin/app/components/gh-date-time-picker.hbs
+++ b/ghost/admin/app/components/gh-date-time-picker.hbs
@@ -37,7 +37,7 @@
         >
         <small class="gh-date-time-picker-timezone" data-test-date-time-picker-timezone>{{this.timezone}}</small>
     </div>
+    {{#if this.hasError}}
+        <div class="gh-date-time-picker-error" data-test-date-time-picker-error>{{this.dateError}}{{this.timeError}}</div>
+    {{/if}}
 </div>
-{{#if this.hasError}}
-    <div class="gh-date-time-picker-error" data-test-date-time-picker-error>{{this.dateError}}{{this.timeError}}</div>
-{{/if}}
diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 9fa54cee9b..047228c5d4 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -204,6 +204,7 @@
 }
 
 .gh-date-time-picker {
+    position: relative;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -724,7 +725,7 @@
 .gh-publish-setting-form .gh-date-time-picker {
     display: grid;
     grid-template-columns: 1fr 1fr;
-    grid-gap: 12px;
+    grid-column-gap: 12px;
 }
 
 .gh-publish-setting-form .gh-date-time-picker-date {
@@ -736,7 +737,7 @@
 
 .gh-publish-setting-form .gh-date-time-picker-time {
     width: unset;
-    height: 40px;
+    height: 38px;
     margin: 0;
     padding: 8px 12px;
     font-size: 1.4rem;
@@ -748,6 +749,13 @@
     font-weight: 500;
 }
 
+.gh-publish-setting-form .gh-date-time-picker-error {
+    grid-column: span 2;
+    margin-top: 4px;
+    font-size: 1.25rem;
+    font-weight: 400;
+}
+
 .publish-flow-datepicker {
     width: 100%;
     max-width: 310px;
@@ -847,7 +855,7 @@
     color: var(--black);
     font-size: 1.8rem;
     font-weight: 400;
-    line-height: 1.35em;
+    line-height: 1.6em;
 }
 
 .gh-publish-confirmation + .gh-box-error {