diff --git a/ghost/admin/app/components/gh-posts-list-item.hbs b/ghost/admin/app/components/gh-posts-list-item.hbs index 9c7f148967..2202d7ae23 100644 --- a/ghost/admin/app/components/gh-posts-list-item.hbs +++ b/ghost/admin/app/components/gh-posts-list-item.hbs @@ -1,5 +1,5 @@ {{!-- template-lint-disable no-invalid-interactive --}} -
  • {{/if}} + {{#unless @hideStatusColumn }} + {{#if (and this.session.user.isContributor @post.isPublished)}} + + {{else}} + +
    + {{#if @post.isScheduled}} + + {{#if this.feature.memberAttribution}} + {{svg-jar "clock" class="gh-post-status-icon"}} + {{/if}} + Scheduled + + {{/if}} + + {{#if @post.isDraft}} + + {{#if this.feature.memberAttribution}} + {{svg-jar "pen-stroke" class="gh-post-status-icon"}} + {{/if}} + Draft + + {{/if}} + + {{#if @post.isPublished}} + + {{#if this.feature.memberAttribution}} + {{svg-jar "check" class="gh-post-status-icon"}} + {{/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 this.feature.memberAttribution}} {{/if}} {{#if this.feature.memberAttribution}} {{/if}} @@ -105,76 +188,4 @@ {{/if}} {{/if}} - - {{#unless @hideStatusColumn }} - {{#if (and this.session.user.isContributor @post.isPublished)}} - - {{else}} - -
    - {{#if @post.isScheduled}} - - Scheduled - {{#if @post.newsletter}} - {{svg-jar "email-stroke"}} - {{/if}} - - {{/if}} - - {{#if @post.isDraft}} - - Draft - - {{/if}} - - {{#if @post.isPublished}} - - Published - {{#if @post.hasEmail}} - {{svg-jar "email-stroke"}} - {{/if}} - - {{/if}} - - {{#if @post.isSent}} - - {{svg-jar "email-stroke"}} - - {{/if}} -
    -     - {{/if}} - {{/unless}}
    • diff --git a/ghost/admin/app/styles/components/lists.css b/ghost/admin/app/styles/components/lists.css index e485d72a70..9e955c5eb2 100644 --- a/ghost/admin/app/styles/components/lists.css +++ b/ghost/admin/app/styles/components/lists.css @@ -220,7 +220,7 @@ ul.nostyle li { .gh-list-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: linear-gradient(90deg, #FB2D8D 0%, #8E42FF 100%); border-top-right-radius: 2.5px; border-bottom-right-radius: 2.5px; position: absolute; diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index e728522f66..d2c26018cb 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -172,17 +172,18 @@ .gh-posts-conversions-header, .gh-posts-sends-header, .gh-posts-opens-header { - width: 110px; + width: 90px; + padding-right: 8px; } .feature-memberAttribution .gh-posts-opens-header { - width: 170px; -} - -.gh-posts-status-header { width: 140px; } +/* .gh-posts-status-header { + width: 140px; +} */ + .pages-list .gh-posts-conversions-header, .pages-list .gh-posts-sends-header { width: 140px; @@ -223,6 +224,12 @@ font-size: 1.3rem; } +.gh-post-list-signups, +.gh-post-list-conversions, +.gh-post-list-recipients { + padding-right: 8px; +} + .gh-content-entry-title { display: flex; align-items: center; @@ -345,6 +352,64 @@ background: color-mod(var(--green) a(20%)); } +.gh-post-list-plain-status .gh-content-status-draft, +.gh-post-list-plain-status .gh-content-status-published, +.gh-post-list-plain-status .gh-content-status-scheduled, +.gh-post-list-plain-status .gh-content-status-emailed { + background: none; + color: var(--darkgrey); + text-transform: unset; + font-size: 1.3rem; + font-weight: 500; +} + +.gh-post-list-plain-status .gh-post-status-email { + margin-bottom: -1px; + margin-left: 4px; +} + +.gh-post-list-plain-status .gh-post-status-email path { + stroke: var(--darkgrey) !important; +} + +.gh-post-list-plain-status .gh-post-status-icon { + width: 16px; + height: 16px; + margin: 0 7px 0 0; +} + +.gh-post-list-plain-status .gh-content-status-published .gh-post-status-icon { + width: 12px; + height: 12px; +} + +.gh-post-list-plain-status .gh-content-status-scheduled .gh-post-status-icon path { + stroke: var(--purple) !important; +} + +.gh-post-list-plain-status .gh-content-status-draft .gh-post-status-icon path { + stroke: var(--pink) !important; +} + +.gh-post-list-plain-status .gh-content-status-published .gh-post-status-icon path { + stroke: var(--midgrey-l1) !important; +} + +.gh-post-list-plain-status .gh-content-status-published, +.gh-post-list-plain-status .gh-content-status-emailed { + color: var(--midgrey-l1); + margin: 0; +} + +.gh-post-list-plain-status .gh-content-status-published .gh-post-status-email path { + stroke: var(--midgrey-l1) !important; +} + +.gh-post-list-plain-status .gh-content-status-emailed path { + stroke: var(--midgrey-l1) !important; + stroke-width: 1.5; +} + .gh-content-entry-author { color: var(--middarkgrey); } @@ -381,7 +446,7 @@ } .feature-memberAttribution .gh-posts-opens-header { - width: 160px; + width: 100px; } } diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs index ac08aacf6a..4d156094f9 100644 --- a/ghost/admin/app/templates/posts.hbs +++ b/ghost/admin/app/templates/posts.hbs @@ -31,6 +31,7 @@ {{#if this.postsInfinityModel}}
  • Title
    +
    {{#unless this.feature.memberAttribution}}Status{{/unless}}
    {{#if this.feature.memberAttribution}}
    Signups
    Paid
    @@ -39,7 +40,6 @@
    Sends
    Opens
    {{/if}} -
    {{#unless this.feature.memberAttribution}}Status{{/unless}}
    • {{/if}} diff --git a/ghost/admin/public/assets/icons/pen-stroke.svg b/ghost/admin/public/assets/icons/pen-stroke.svg new file mode 100644 index 0000000000..d3b0e93924 --- /dev/null +++ b/ghost/admin/public/assets/icons/pen-stroke.svg @@ -0,0 +1 @@ +pencil \ No newline at end of file