diff --git a/ghost/admin/app/components/gh-nav-menu/design.hbs b/ghost/admin/app/components/gh-nav-menu/design.hbs
index be0e34f95b..84b9ff1dce 100644
--- a/ghost/admin/app/components/gh-nav-menu/design.hbs
+++ b/ghost/admin/app/components/gh-nav-menu/design.hbs
@@ -1,6 +1,7 @@
- {{svg-jar "arrow-left-small"}} Settings
+ Settings
+ {{svg-jar "arrow-right-small"}} Design
diff --git a/ghost/admin/app/components/posts/analytics.hbs b/ghost/admin/app/components/posts/analytics.hbs
index d3cccd7c73..d308d372f2 100644
--- a/ghost/admin/app/components/posts/analytics.hbs
+++ b/ghost/admin/app/components/posts/analytics.hbs
@@ -1,42 +1,44 @@
-
-
-
- Posts
-
- {{svg-jar "arrow-right-small"}}Analytics
-
- - {{this.post.title}} -
-
-
- {{#if
- (or this.post.isSent
- (and this.post.isPublished this.post.email)
- this.post.willEmail
- )
- }}
- {{#if this.post.emailOnly}}
- Sent
- {{else}}
- Published and sent
- {{/if}}
- {{else}}
- Published on your site
- {{/if}}
-
- {{#let (moment-site-tz this.post.publishedAtUTC) as |publishedAt|}}
- on
- {{moment-format publishedAt "D MMM YYYY"}}
- at
- {{moment-format publishedAt "HH:mm"}}
- {{/let}}
+
+
diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css
index 84c28a2044..ac4dc155fc 100644
--- a/ghost/admin/app/styles/app-dark.css
+++ b/ghost/admin/app/styles/app-dark.css
@@ -326,11 +326,6 @@ input:focus,
border-bottom: 1px solid var(--hairline-color-1);
}
-.gh-main-section.no-heading,
-.gh-main-section.bt {
- border-top: 1px solid var(--hairline-color-1);
-}
-
.gh-btn-tabs .gh-btn {
background: transparent !important;
}
diff --git a/ghost/admin/app/styles/layouts/apps.css b/ghost/admin/app/styles/layouts/apps.css
index 64c516c31e..95dd1ddeb5 100644
--- a/ghost/admin/app/styles/layouts/apps.css
+++ b/ghost/admin/app/styles/layouts/apps.css
@@ -328,19 +328,18 @@
justify-content: flex-start;
align-items: flex-start;
align-content: flex-start;
- margin-top: 24px;
}
.app-icon {
position: relative;
- flex: 1 0 56px;
- width: 56px;
- min-width: 56px;
- height: 56px;
+ flex: 1 0 60px;
+ width: 60px;
+ min-width: 60px;
+ height: 60px;
background-position: center center;
background-size: cover;
border-radius: 10%;
- margin-right: 32px;
+ margin-right: 24px;
}
.app-icon img {
@@ -348,16 +347,16 @@
}
.app-cell h3 {
- margin: 4px 0 0;
+ margin: -2px 0 0;
color: var(--black);
- font-size: 2.1rem;
- font-weight: 600;
+ font-size: 3.2rem;
+ font-weight: 700;
}
.app-cell p {
margin: 0;
margin-bottom: 5px;
- color: var(--midgrey);
+ color: var(--midgrey-l2);
font-size: 1.4rem;
line-height: 1.4em;
}
@@ -420,7 +419,7 @@
/* Zapier templates */
/* ---------------------------------------------------------- */
.gh-zapier-data-container {
- margin: 1.6em 0;
+ margin: 1.8em 0;
}
.gh-zapier-data-container .gh-zapier-data {
@@ -437,9 +436,9 @@
.gh-zapier-data .data-label {
width: 128px;
- height: 36px;
- padding: 8px 8px 8px 0;
- color: var(--midgrey);
+ height: 28px;
+ padding: 4px 4px 4px 0;
+ color: var(--midgrey-l2);
font-size: 1.4rem;
line-height: 1.45;
font-weight: 400;
@@ -448,8 +447,8 @@
.gh-zapier-data .data {
width: 100%;
- height: 36px;
- padding: 8px;
+ height: 28px;
+ padding: 4px;
color: var(--darkgrey);
font-size: 1.4rem;
line-height: 1.45;
diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css
index 36f00969b2..9dbd5715fb 100644
--- a/ghost/admin/app/styles/layouts/content.css
+++ b/ghost/admin/app/styles/layouts/content.css
@@ -743,10 +743,8 @@ a.gh-post-list-signups.active:hover > span, a.gh-post-list-conversions.active:ho
animation: .25s fadeIn .5s normal forwards;
}
-.gh-post-analytics-header {
- position: relative;
- margin: 0 0 2.4rem;
- padding: 0 0 1.6rem;
+.gh-post-analytics-header .gh-canvas-header-content {
+ padding-bottom: 1.6rem;
border-bottom: 1px solid var(--whitegrey);
}
@@ -767,7 +765,7 @@ a.gh-post-list-signups.active:hover > span, a.gh-post-list-conversions.active:ho
}
.gh-post-analytics-meta-text {
- color: var(--midlightgrey-d2);
+ color: var(--midgrey-l2);
font-size: 1.35rem;
display: flex;
align-items: center;
diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css
index a65489169b..6eb674e81e 100644
--- a/ghost/admin/app/styles/layouts/main.css
+++ b/ghost/admin/app/styles/layouts/main.css
@@ -1097,9 +1097,9 @@
}
.gh-canvas-header {
+ min-height: calc(var(--main-layout-vpanel-height) - 1px);;
margin: 0 calc(-1 * var(--main-layout-content-sidepadding));
- padding: 0 var(--main-layout-content-sidepadding);
- position: sticky;
+ padding: 32px var(--main-layout-content-sidepadding);
top: 0;
background: var(--main-bg-color);
z-index: 700;
@@ -1107,6 +1107,10 @@
border-color: transparent;
}
+.gh-canvas-header.sticky {
+ position: sticky;
+}
+
.gh-canvas.circle-bg .gh-canvas-header {
position: relative;
background: none;
@@ -1117,36 +1121,36 @@
background: var(--main-color-content-greybg);
}
-.gh-canvas-header.stacked {
- padding-top: 36px;
-}
-
-.gh-canvas-header.stacked .gh-canvas-breadcrumb {
+.gh-canvas-header .gh-canvas-breadcrumb {
display: flex;
align-items: center;
- height: 24px;
- color: var(--darkgrey-l1);
+ height: 34px;
+ color: var(--midgrey-l2);
font-size: 1.35rem;
- font-weight: 500;
- line-height: 24px;
+ font-weight: 400;
+ line-height: 34px;
letter-spacing: .2px;
background: none;
}
-.gh-canvas-header.stacked .gh-canvas-breadcrumb a {
- color: var(--darkgrey-l1);
+.gh-canvas-header.sticky .gh-canvas-breadcrumb {
+ position: sticky
+}
+
+.gh-canvas-header .gh-canvas-breadcrumb a {
+ color: var(--darkgrey);
line-height: 24px;
}
-.gh-canvas-header.stacked .gh-canvas-breadcrumb svg {
+.gh-canvas-header .gh-canvas-breadcrumb svg {
display: block;
width: 9px;
height: 9px;
margin: 1px 6px 0;
}
-.gh-canvas-header.stacked .gh-canvas-breadcrumb svg path {
- stroke: var(--darkgrey-l1);
+.gh-canvas-header .gh-canvas-breadcrumb svg path {
+ stroke: var(--midgrey-l2);
}
.gh-main-grey-gradient .gh-canvas-header {
@@ -1155,18 +1159,11 @@
}
.gh-canvas-header-content {
- height: calc(var(--main-layout-vpanel-height) - 1px);
position: relative;
flex-shrink: 0;
display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.gh-canvas-header.stacked .gh-canvas-header-content {
- flex-direction: column;
align-items: flex-start;
- height: unset;
+ justify-content: space-between;
}
.gh-main-width {
@@ -1213,11 +1210,6 @@
grid-column-gap: 0;
}
-.gh-main-section.no-heading,
-.gh-main-section.bt {
- border-top: 1px solid var(--whitegrey);
-}
-
.gh-main-section.bb { border-bottom: 1px solid var(--whitegrey); }
.gh-main-section-header {
@@ -1488,7 +1480,7 @@
padding: 0;
text-overflow: ellipsis;
white-space: nowrap;
- font-size: 3.1rem;
+ font-size: 3.2rem;
line-height: 1.3em;
font-weight: 700;
letter-spacing: -0.021em;
@@ -1513,6 +1505,10 @@
margin: 0 10px;
}
+.gh-canvas-breadcrumb + .gh-canvas-title {
+ padding: 12px 0 0;
+}
+
.gh-btn-edit-view {
opacity: 0;
transition: all 0.3s ease-in-out;
diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css
index d5631a8458..f11b8ce7a4 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -681,7 +681,7 @@ label[for="member-description"] + p {
.gh-member-details {
position: sticky;
- top: 96px;
+ top: 158px;
left: 0;
height: max-content;
}
diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css
index 5dd682def4..a08d3bedaa 100644
--- a/ghost/admin/app/styles/layouts/settings.css
+++ b/ghost/admin/app/styles/layouts/settings.css
@@ -1798,42 +1798,35 @@ p.theme-validation-details {
}
.gh-nav-header {
- height: 100px;
- padding: 32px 32px 16px;
+ display: flex;
+ align-items: center;
+ padding: 32px 32px 48px;
+ color: var(--midgrey-l2);
+ font-size: 1.35rem;
+ font-weight: 400;
+ line-height: 36px;
+ letter-spacing: .2px;
}
.gh-nav-menu-back-button {
display: flex;
align-items: center;
- margin-bottom: 40px;
- padding: 6px 0;
- color: var(--darkgrey-l1);
- font-size: 1.35rem;
- font-weight: 500;
- letter-spacing: .2px;
+ height: 36px;
+ color: var(--darkgrey);
background: none;
}
-.gh-nav-menu-back-button svg {
+.gh-nav-header svg {
display: block;
width: 9px;
height: 9px;
- margin: 1px 8px 0 0;
- transition: transform 0.4s cubic-bezier(0.1, 0.7, 0.1, 1);
+ margin: 1px 6px 0;
}
-.gh-nav-menu-back-button svg path {
+.gh-nav-header svg path {
stroke: var(--darkgrey-l1);
}
-.gh-nav-menu-back-button:hover svg {
- transform: translateX(-3px)
-}
-
-.gh-nav-menu-back-button:hover svg path {
- stroke: var(--black);
-}
-
.gh-nav-menu-back-button:hover {
color: var(--black);
}
diff --git a/ghost/admin/app/templates/member.hbs b/ghost/admin/app/templates/member.hbs
index 430f06d897..94e9010749 100644
--- a/ghost/admin/app/templates/member.hbs
+++ b/ghost/admin/app/templates/member.hbs
@@ -1,14 +1,20 @@
-
-
-
+
+
{{#if this.session.user.isAdmin}}
diff --git a/ghost/admin/app/templates/offer.hbs b/ghost/admin/app/templates/offer.hbs
index ff6338506d..c317848a2c 100644
--- a/ghost/admin/app/templates/offer.hbs
+++ b/ghost/admin/app/templates/offer.hbs
@@ -1,17 +1,24 @@
-
-
+
- {{svg-jar "pen" title=""}}Edit post
-
+
+ Posts
+
+ {{svg-jar "arrow-right-small"}}Analytics
+
+ + {{this.post.title}} +
+
+
+ {{svg-jar "pen" title=""}}Edit post
+
-
+ {{#if
+ (or this.post.isSent
+ (and this.post.isPublished this.post.email)
+ this.post.willEmail
+ )
+ }}
+ {{#if this.post.emailOnly}}
+ Sent
+ {{else}}
+ Published and sent
+ {{/if}}
+ {{else}}
+ Published on your site
+ {{/if}}
+
+ {{#let (moment-site-tz this.post.publishedAtUTC) as |publishedAt|}}
+ on
+ {{moment-format publishedAt "D MMM YYYY"}}
+ at
+ {{moment-format publishedAt "HH:mm"}}
+ {{/let}}
+
+
- Members
- {{svg-jar "arrow-right"}}
- {{#if this.member.isNew}}
- New member
- {{else}}
- {{or this.member.name this.member.email}}
- {{/if}}
-
+
+
+
+ Members
+
+ {{svg-jar "arrow-right-small"}} Member
+
+ + {{#if this.member.isNew}} + New member + {{else}} + {{or this.member.name this.member.email}} + {{/if}} +
+
- Offers
- {{svg-jar "arrow-right"}}
- {{#if this.offer.isNew}}
- New Offer
- {{else}}
- {{this.offer.name}}
- {{#if (eq this.offer.status "archived")}}
- Archived
+
+
+
+ Offers
+
+ {{svg-jar "arrow-right-small"}} Offer
+
+
+ {{#if this.offer.isNew}}
+ New Offer
+ {{else}}
+ {{this.offer.name}}
+ {{#if (eq this.offer.status "archived")}}
+ Archived
+ {{/if}}
{{/if}}
- {{/if}}
-
+
+
+
diff --git a/ghost/admin/app/templates/offers.hbs b/ghost/admin/app/templates/offers.hbs
index 9fcacc32dd..877399dda3 100644
--- a/ghost/admin/app/templates/offers.hbs
+++ b/ghost/admin/app/templates/offers.hbs
@@ -1,5 +1,5 @@
-
+
Offers
diff --git a/ghost/admin/app/templates/pages-loading.hbs b/ghost/admin/app/templates/pages-loading.hbs
index 69375fa0c8..65193786fb 100644
--- a/ghost/admin/app/templates/pages-loading.hbs
+++ b/ghost/admin/app/templates/pages-loading.hbs
@@ -1,5 +1,5 @@
-
+
diff --git a/ghost/admin/app/templates/pages.hbs b/ghost/admin/app/templates/pages.hbs
index 4bfb9eaf77..3e55aedda1 100644
--- a/ghost/admin/app/templates/pages.hbs
+++ b/ghost/admin/app/templates/pages.hbs
@@ -1,5 +1,5 @@
-
+
diff --git a/ghost/admin/app/templates/posts-clicks.hbs b/ghost/admin/app/templates/posts-clicks.hbs
index 8bccf30ca5..c61dbac540 100644
--- a/ghost/admin/app/templates/posts-clicks.hbs
+++ b/ghost/admin/app/templates/posts-clicks.hbs
@@ -1,5 +1,5 @@
-
+
diff --git a/ghost/admin/app/templates/posts-loading.hbs b/ghost/admin/app/templates/posts-loading.hbs
index b0dcf4b11d..ac55bcac85 100644
--- a/ghost/admin/app/templates/posts-loading.hbs
+++ b/ghost/admin/app/templates/posts-loading.hbs
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/ghost/admin/app/templates/settings/code-injection-loading.hbs b/ghost/admin/app/templates/settings/code-injection-loading.hbs
index df3b559ebc..cec4c07304 100644
--- a/ghost/admin/app/templates/settings/code-injection-loading.hbs
+++ b/ghost/admin/app/templates/settings/code-injection-loading.hbs
@@ -1,10 +1,16 @@
-
- Settings
- {{svg-jar "arrow-right"}}
- Code injection
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} Code injection
+
+
+ Code injection
+
+
diff --git a/ghost/admin/app/templates/settings/code-injection.hbs b/ghost/admin/app/templates/settings/code-injection.hbs
index 4628536a1f..267d922e1a 100644
--- a/ghost/admin/app/templates/settings/code-injection.hbs
+++ b/ghost/admin/app/templates/settings/code-injection.hbs
@@ -1,10 +1,16 @@
-
- Settings
- {{svg-jar "arrow-right"}}
- Code injection
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} Code injection
+
+
+ Code injection
+
+
diff --git a/ghost/admin/app/templates/settings/general-loading.hbs b/ghost/admin/app/templates/settings/general-loading.hbs
index 95a455460b..df1c78fe4c 100644
--- a/ghost/admin/app/templates/settings/general-loading.hbs
+++ b/ghost/admin/app/templates/settings/general-loading.hbs
@@ -1,10 +1,16 @@
-
-
- Settings
- {{svg-jar "arrow-right"}}
- General
-
+
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} General
+
+
+ General
+
+
diff --git a/ghost/admin/app/templates/settings/general.hbs b/ghost/admin/app/templates/settings/general.hbs
index 659a2f7e74..c90d542efb 100644
--- a/ghost/admin/app/templates/settings/general.hbs
+++ b/ghost/admin/app/templates/settings/general.hbs
@@ -1,10 +1,16 @@
-
- Settings
- {{svg-jar "arrow-right"}}
- General
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} General
+
+
+ General
+
+
diff --git a/ghost/admin/app/templates/settings/history.hbs b/ghost/admin/app/templates/settings/history.hbs
index 32a4360f47..8f46bdecba 100644
--- a/ghost/admin/app/templates/settings/history.hbs
+++ b/ghost/admin/app/templates/settings/history.hbs
@@ -1,24 +1,34 @@
-
- Settings
- {{svg-jar "arrow-right"}}
- History
- {{#if this.userRecord}}
- {{svg-jar "arrow-right"}}
- {{or this.userRecord.name this.userRecord.email}}
- {{/if}}
-
-
-
+
+
+
+ Settings
+
+ {{#if this.userRecord}}
+ {{svg-jar "arrow-right-small"}}
+
+ History
+
+ {{svg-jar "arrow-right-small"}} {{or this.userRecord.name this.userRecord.email}}
+ {{else}}
+ {{svg-jar "arrow-right-small"}} History
+ {{/if}}
+
+
+ History
+
+
+
+
-
-
+
+
{{#let (history-event-fetcher filter=(history-event-filter excludedEvents=this.fullExcludedEvents excludedResources=this.fullExcludedResources user=this.user) pageSize=50) as |eventsFetcher|}}
diff --git a/ghost/admin/app/templates/settings/integration.hbs b/ghost/admin/app/templates/settings/integration.hbs
index bc5663e31e..54c18420dc 100644
--- a/ghost/admin/app/templates/settings/integration.hbs
+++ b/ghost/admin/app/templates/settings/integration.hbs
@@ -1,13 +1,21 @@
+
+ Offers
+
+ {{svg-jar "arrow-right-small"}} Offer
+
+ + {{#if this.offer.isNew}} + New Offer + {{else}} + {{this.offer.name}} + {{#if (eq this.offer.status "archived")}} + Archived + {{/if}} {{/if}} - {{/if}} -
+ +Offers
diff --git a/ghost/admin/app/templates/pages-loading.hbs b/ghost/admin/app/templates/pages-loading.hbs
index 69375fa0c8..65193786fb 100644
--- a/ghost/admin/app/templates/pages-loading.hbs
+++ b/ghost/admin/app/templates/pages-loading.hbs
@@ -1,5 +1,5 @@
-
+
diff --git a/ghost/admin/app/templates/pages.hbs b/ghost/admin/app/templates/pages.hbs
index 4bfb9eaf77..3e55aedda1 100644
--- a/ghost/admin/app/templates/pages.hbs
+++ b/ghost/admin/app/templates/pages.hbs
@@ -1,5 +1,5 @@
-
+
diff --git a/ghost/admin/app/templates/posts-clicks.hbs b/ghost/admin/app/templates/posts-clicks.hbs
index 8bccf30ca5..c61dbac540 100644
--- a/ghost/admin/app/templates/posts-clicks.hbs
+++ b/ghost/admin/app/templates/posts-clicks.hbs
@@ -1,5 +1,5 @@
-
+
diff --git a/ghost/admin/app/templates/posts-loading.hbs b/ghost/admin/app/templates/posts-loading.hbs
index b0dcf4b11d..ac55bcac85 100644
--- a/ghost/admin/app/templates/posts-loading.hbs
+++ b/ghost/admin/app/templates/posts-loading.hbs
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/ghost/admin/app/templates/settings/code-injection-loading.hbs b/ghost/admin/app/templates/settings/code-injection-loading.hbs
index df3b559ebc..cec4c07304 100644
--- a/ghost/admin/app/templates/settings/code-injection-loading.hbs
+++ b/ghost/admin/app/templates/settings/code-injection-loading.hbs
@@ -1,10 +1,16 @@
-
-
+
diff --git a/ghost/admin/app/templates/settings/code-injection.hbs b/ghost/admin/app/templates/settings/code-injection.hbs
index 4628536a1f..267d922e1a 100644
--- a/ghost/admin/app/templates/settings/code-injection.hbs
+++ b/ghost/admin/app/templates/settings/code-injection.hbs
@@ -1,10 +1,16 @@
-
-
+
diff --git a/ghost/admin/app/templates/settings/general-loading.hbs b/ghost/admin/app/templates/settings/general-loading.hbs
index 95a455460b..df1c78fe4c 100644
--- a/ghost/admin/app/templates/settings/general-loading.hbs
+++ b/ghost/admin/app/templates/settings/general-loading.hbs
@@ -1,10 +1,16 @@
-
-
-
+
+
diff --git a/ghost/admin/app/templates/settings/general.hbs b/ghost/admin/app/templates/settings/general.hbs
index 659a2f7e74..c90d542efb 100644
--- a/ghost/admin/app/templates/settings/general.hbs
+++ b/ghost/admin/app/templates/settings/general.hbs
@@ -1,10 +1,16 @@
-
-
+
diff --git a/ghost/admin/app/templates/settings/history.hbs b/ghost/admin/app/templates/settings/history.hbs
index 32a4360f47..8f46bdecba 100644
--- a/ghost/admin/app/templates/settings/history.hbs
+++ b/ghost/admin/app/templates/settings/history.hbs
@@ -1,24 +1,34 @@
-
-
-
- Settings
- {{svg-jar "arrow-right"}}
- Code injection
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} Code injection
+
+ + Code injection +
+
- Settings
- {{svg-jar "arrow-right"}}
- Code injection
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} Code injection
+
+ + Code injection +
+
- Settings
- {{svg-jar "arrow-right"}}
- General
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} General
+
+ + General +
+
- Settings
- {{svg-jar "arrow-right"}}
- General
-
+
+
+
+ Settings
+
+ {{svg-jar "arrow-right-small"}} General
+
+ + General +
+
- Settings
- {{svg-jar "arrow-right"}}
- History
- {{#if this.userRecord}}
- {{svg-jar "arrow-right"}}
- {{or this.userRecord.name this.userRecord.email}}
- {{/if}}
-
-
-
+
+
+
+
+
+ Settings
+
+ {{#if this.userRecord}}
+ {{svg-jar "arrow-right-small"}}
+
+ History
+
+ {{svg-jar "arrow-right-small"}} {{or this.userRecord.name this.userRecord.email}}
+ {{else}}
+ {{svg-jar "arrow-right-small"}} History
+ {{/if}}
+
+ + History +
+
+
-
-
+
{{#let (history-event-fetcher filter=(history-event-filter excludedEvents=this.fullExcludedEvents excludedResources=this.fullExcludedResources user=this.user) pageSize=50) as |eventsFetcher|}}
diff --git a/ghost/admin/app/templates/settings/integration.hbs b/ghost/admin/app/templates/settings/integration.hbs
index bc5663e31e..54c18420dc 100644
--- a/ghost/admin/app/templates/settings/integration.hbs
+++ b/ghost/admin/app/templates/settings/integration.hbs
@@ -1,13 +1,21 @@