diff --git a/ghost/admin/app/components/gh-posts-list-item.hbs b/ghost/admin/app/components/gh-posts-list-item.hbs index 2202d7ae23..776ffa5fd7 100644 --- a/ghost/admin/app/components/gh-posts-list-item.hbs +++ b/ghost/admin/app/components/gh-posts-list-item.hbs @@ -47,104 +47,93 @@ {{/if}} - {{#unless @hideStatusColumn }} - {{#if (and this.session.user.isContributor @post.isPublished)}} -
- {{else}} - -
- {{#if @post.isScheduled}} - - {{#if this.feature.memberAttribution}} + {{#if @post.isPublished}} + + Published + {{#if @post.hasEmail}} + {{svg-jar "email-stroke" class="gh-post-status-email"}} + {{/if}} + + {{/if}} + + {{#if @post.isSent}} + + {{svg-jar "email-stroke" class="gh-post-status-email"}} + + {{/if}} +
+ + {{else}} + +
+ {{#if @post.isScheduled}} + {{svg-jar "clock" class="gh-post-status-icon"}} + Scheduled + {{/if}} - Scheduled - - {{/if}} - {{#if @post.isDraft}} - - {{#if this.feature.memberAttribution}} + {{#if @post.isDraft}} + {{svg-jar "pen-stroke" class="gh-post-status-icon"}} + Draft + {{/if}} - Draft - - {{/if}} - {{#if @post.isPublished}} - - {{#if this.feature.memberAttribution}} + {{#if @post.isPublished}} + {{svg-jar "check" class="gh-post-status-icon"}} + Published + {{#if @post.hasEmail}} + & Sent + {{/if}} + {{/if}} - Published - {{#if @post.hasEmail}} - & sent - {{/if}} - - {{/if}} - {{#if @post.isSent}} - - {{svg-jar "email-stroke" class="gh-post-status-icon"}} - Sent - - {{/if}} -
-
- {{/if}} - {{/unless}} + {{#if @post.isSent}} + + {{svg-jar "email-stroke" class="gh-post-status-icon"}} + Sent + + {{/if}} +
+ + {{/if}} + {{/unless}} + {{/if}} {{#if this.feature.memberAttribution}} {{/if}} {{#if this.feature.memberAttribution}} {{/if}} @@ -188,4 +177,74 @@ {{/if}} {{/if}} + + {{!-- Statuses for without the Member Attribution feature flag --}} + {{#unless this.feature.memberAttribution}} + {{#unless @hideStatusColumn }} + {{#if (and this.session.user.isContributor @post.isPublished)}} + + {{else}} + +
+ {{#if @post.isScheduled}} + + Scheduled + + {{/if}} + + {{#if @post.isDraft}} + + Draft + + {{/if}} + + {{#if @post.isPublished}} + + Published + {{svg-jar "email-stroke" class="gh-post-status-icon"}} + + {{/if}} + + {{#if @post.isSent}} + + {{svg-jar "email-stroke" class="gh-post-status-icon"}} + + {{/if}} +
+
+ {{/if}} + {{/unless}} + {{/unless}} diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index d2c26018cb..b68960fc5e 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -177,12 +177,12 @@ } .feature-memberAttribution .gh-posts-opens-header { - width: 140px; + width: 150px; } -/* .gh-posts-status-header { +.gh-list:not(.feature-memberAttribution) .gh-posts-status-header { width: 140px; -} */ +} .pages-list .gh-posts-conversions-header, .pages-list .gh-posts-sends-header { @@ -315,12 +315,16 @@ } .gh-content-status-emailed { - margin: 0px 6px; + margin: 0; color: var(--midgrey-d1); background: var(--whitegrey); border-radius: 999px; } +.feature-memberAttribution .gh-content-status-emailed { + margin: 0px 6px; +} + .gh-content-status-emailed svg, .gh-content-status-published svg, .gh-content-status-scheduled svg { @@ -453,6 +457,23 @@ /* Mobile style of post list */ @media (max-width: 1200px) { + .feature-memberAttribution .gh-post-list-status, + .feature-memberAttribution .gh-post-list-recipients, + .feature-memberAttribution .gh-post-list-opens, + .feature-memberAttribution .gh-post-list-signups, + .feature-memberAttribution .gh-post-list-conversions { + padding-left: 0; + padding-right: 0; + } + + .gh-content-status-draft, + .gh-content-status-published, + .gh-content-status-scheduled, + .gh-content-status-emailed { + padding-left: 0; + padding-right: 12px; + } + .gh-posts-list-item { display: flex; flex-wrap: wrap; @@ -565,7 +586,7 @@ .gh-content-email-stats-mobile { display: inherit; - padding: 0 0.25em; + padding: 0 0.33em; } .gh-content-attribution-stats { @@ -574,7 +595,7 @@ .gh-content-attribution-stats-mobile { display: inherit; - padding: 0 0.25em; + padding: 0 0.33em; } .posts-list .gh-list-nodata { diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css index c0238cdc5d..7a7760b4ce 100644 --- a/ghost/admin/app/styles/layouts/dashboard.css +++ b/ghost/admin/app/styles/layouts/dashboard.css @@ -1481,8 +1481,8 @@ Dashboard Misc */ } .gh-dashboard-rate-amount > span { - background: rgb(213,184,255); - background: linear-gradient(90deg, rgba(213,184,255,1) 0%, rgba(142,66,255,1) 100%); + background: #d5b8ff; + background: linear-gradient(90deg,#fb2d8d,#8e42ff); border-top-right-radius: 2.5px; border-bottom-right-radius: 2.5px; position: absolute; diff --git a/ghost/admin/app/templates/pages.hbs b/ghost/admin/app/templates/pages.hbs index 6e58e4c100..3e48d5b1dd 100644 --- a/ghost/admin/app/templates/pages.hbs +++ b/ghost/admin/app/templates/pages.hbs @@ -31,11 +31,11 @@ {{#if this.postsInfinityModel}}
  • Title
    +
    {{#unless this.feature.memberAttribution}}Status{{/unless}}
    {{#if this.feature.memberAttribution}}
    Signups
    Conversions
    {{/if}} -
    {{#unless this.feature.memberAttribution}}Status{{/unless}}
  • {{/if}} diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs index 4d156094f9..9d4caf22ec 100644 --- a/ghost/admin/app/templates/posts.hbs +++ b/ghost/admin/app/templates/posts.hbs @@ -31,8 +31,8 @@ {{#if this.postsInfinityModel}}
  • Title
    -
    {{#unless this.feature.memberAttribution}}Status{{/unless}}
    {{#if this.feature.memberAttribution}} +
    Signups
    Paid
    {{/if}} @@ -40,6 +40,9 @@
    Sends
    Opens
    {{/if}} + {{#unless this.feature.memberAttribution}} +
    Status
    + {{/unless}}
  • {{/if}}