diff --git a/ghost/admin/app/components/gh-post-settings-menu-labs.hbs b/ghost/admin/app/components/gh-post-settings-menu-labs.hbs index d74646651b..492521d502 100644 --- a/ghost/admin/app/components/gh-post-settings-menu-labs.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu-labs.hbs @@ -1,10 +1,10 @@
-
+

{{capitalize this.post.displayName}} settings

-
+
{{#unless (feature "featureImageMeta")}} View {{this.post.displayName}} {{svg-jar "external"}} - {{else}} + {{else if this.post.isScheduled}} Preview {{svg-jar "external"}} @@ -178,13 +178,13 @@
{{#if (eq this.subview "meta-data")}} -
+

Meta data

-
+
@@ -250,13 +250,13 @@ {{/if}} {{#if (eq this.subview "twitter-data")}} -
+

Twitter card

-
+
+

Facebook card

-
+
+

Code injection

-
+
diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.hbs b/ghost/admin/app/components/gh-post-settings-menu/email.hbs index 7579cd7f3f..ec6c480882 100644 --- a/ghost/admin/app/components/gh-post-settings-menu/email.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu/email.hbs @@ -1,16 +1,16 @@ -
+

Email newsletter

-
+
{{#if this.post.email.isSuccess}} {{!-- Mail has already been sent --}}
- {{svg-jar "send-email" class="w7 h7 stroke-darkgrey"}} + {{svg-jar "send-email" class="w6 h6 stroke-midlightgrey"}}

Post was sent by email to

@@ -32,7 +32,7 @@
-

+

{{else if (or this.retryEmail.isRunning this.post.email.isFailure)}} diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css index 0ac6496c09..773570b348 100644 --- a/ghost/admin/app/styles/components/settings-menu.css +++ b/ghost/admin/app/styles/components/settings-menu.css @@ -381,13 +381,12 @@ /* LABS ----------------------------------------------------------------------*/ .settings-menu-container-labs { - min-width: 380px; + z-index: 999; height: 100vh; - padding-top: 21px; - border-left: 1px solid var(--lightgrey); + min-width: 380px; overflow-x: visible; overflow-y: auto; - z-index: 999; + border-left: 1px solid var(--whitegrey-d1); } .settings-menu-container-labs-wide { @@ -398,8 +397,9 @@ .settings-menu-toggle-labs { position: absolute; top: 31px; - right: 0; + right: 24px; z-index: 9999; + margin-right: 0 !important; } .settings-menu-toggle-spacer-labs { @@ -411,11 +411,11 @@ top: 0; right: 0; bottom: 0; + width: 100%; + max-width: 380px; overflow: auto; - opacity: 1; - width: 380px; - min-width: 380px; background-color: white; + opacity: 1; } .settings-menu-container-labs-wide .settings-menu-pane { @@ -429,3 +429,40 @@ right: auto; bottom: auto; } + +.settings-menu-header.labs { + position: fixed; + z-index: 1; + width: 100%; + max-width: 364px; + padding: 36px 24px 24px; + background: var(--white); +} + +.settings-menu-content.labs { + padding: 104px 24px 24px; +} + +.settings-menu-header.subview.labs { + z-index: 2; + width: 100%; + max-width: 484px; +} + +.settings-menu-header.subview.labs .back { + padding: 2px 15px 0 !important; +} + +.settings-menu-header.subview.labs .back svg { + width: 12px; + height: 12px; +} + +.settings-menu-header.subview.labs h4 { + width: 100%; + text-align: left; +} + +.gh-publishmenu-labs { + margin-right: 8px; +} \ No newline at end of file diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css index ba97fe6a48..4e61c11d70 100644 --- a/ghost/admin/app/styles/layouts/editor.css +++ b/ghost/admin/app/styles/layouts/editor.css @@ -99,7 +99,11 @@ top: -1px; right: 0; font-size: 1.3rem; - color: var(--green); + color: var(--midgrey); +} + +.post-view-link:hover { + color: var(--darkgrey); } .post-view-link svg { @@ -108,7 +112,11 @@ height: 12px; vertical-align: middle; margin-bottom: 2px; - fill: var(--green); + fill: var(--midgrey); +} + +.post-view-link:hover svg { + fill: var(--darkgrey); } diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css index de6d77680a..dba0490bb8 100644 --- a/ghost/admin/app/styles/layouts/main.css +++ b/ghost/admin/app/styles/layouts/main.css @@ -1445,7 +1445,6 @@ height: 16px; width: 16px; margin-right: 0; - margin-top: 1px; } .gh-actions-cog svg path { diff --git a/ghost/admin/app/styles/patterns/forms.css b/ghost/admin/app/styles/patterns/forms.css index 86688049b2..31c323434e 100644 --- a/ghost/admin/app/styles/patterns/forms.css +++ b/ghost/admin/app/styles/patterns/forms.css @@ -144,7 +144,6 @@ input { position: absolute; top: 50%; left: 10px; - z-index: 2; width: 14px; height: 14px; fill: color-mod(var(--lightgrey) l(-15%) s(-10%)); diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs index 2bd87924b7..312c15fc37 100644 --- a/ghost/admin/app/templates/editor.hbs +++ b/ghost/admin/app/templates/editor.hbs @@ -43,6 +43,15 @@ @runningText="Saving" @class="gh-btn gh-btn-blue gh-btn-icon contributor-save-button" data-test-contributor-save=true /> + {{else if (feature "psmRedesign")}} +
+ +
{{else}}