From fadf90c61eaedc7d3f9b38f8f749816e9985b262 Mon Sep 17 00:00:00 2001 From: Sanne de Vries Date: Wed, 12 Apr 2023 17:18:01 +0100 Subject: [PATCH] Updated post list context menu Refs https://github.com/TryGhost/Team/issues/2923 --- .../components/posts-list/context-menu.hbs | 12 +++---- .../app/components/posts-list/list-item.hbs | 2 +- .../posts-list/modals/delete-posts.hbs | 2 +- .../posts-list/modals/edit-posts-access.hbs | 1 - .../posts-list/modals/unpublish-posts.hbs | 4 +-- .../admin/app/styles/components/dropdowns.css | 31 ++++++++++++++++++- ghost/admin/app/styles/layouts/content.css | 9 +++--- ghost/admin/app/styles/layouts/users.css | 5 +++ ghost/admin/app/styles/patterns/global.css | 2 +- ghost/admin/public/assets/icons/lock.svg | 6 ++-- ghost/admin/public/assets/icons/star-fill.svg | 4 +++ ghost/admin/public/assets/icons/star.svg | 5 +-- ghost/admin/public/assets/icons/undo.svg | 5 +++ 13 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 ghost/admin/public/assets/icons/star-fill.svg create mode 100644 ghost/admin/public/assets/icons/undo.svg diff --git a/ghost/admin/app/components/posts-list/context-menu.hbs b/ghost/admin/app/components/posts-list/context-menu.hbs index 2943ac1da4..da82c57288 100644 --- a/ghost/admin/app/components/posts-list/context-menu.hbs +++ b/ghost/admin/app/components/posts-list/context-menu.hbs @@ -3,7 +3,7 @@ {{#if this.canUnpublishSelection}}
    • {{/if}} @@ -11,31 +11,31 @@ {{#if this.shouldFeatureSelection }}
    • {{else}}
    • {{/if}} {{/if}}
    • {{#if this.session.user.isAdmin}}
    • {{/if}} diff --git a/ghost/admin/app/components/posts-list/list-item.hbs b/ghost/admin/app/components/posts-list/list-item.hbs index a4c84efbd8..9e4565e9b2 100644 --- a/ghost/admin/app/components/posts-list/list-item.hbs +++ b/ghost/admin/app/components/posts-list/list-item.hbs @@ -48,7 +48,7 @@

    {{#if @post.featured}} - {{svg-jar "star" class="gh-featured-post"}} + {{svg-jar "star-fill" class="gh-featured-post"}} {{/if}} {{@post.title}} {{#if @post.lexical}} diff --git a/ghost/admin/app/components/posts-list/modals/delete-posts.hbs b/ghost/admin/app/components/posts-list/modals/delete-posts.hbs index 089ed0154a..9375273249 100644 --- a/ghost/admin/app/components/posts-list/modals/delete-posts.hbs +++ b/ghost/admin/app/components/posts-list/modals/delete-posts.hbs @@ -1,6 +1,6 @@
    -

    Are you sure you want to delete {{if @data.selectionList.isSingle 'this post' (concat @data.selectionList.count ' posts')}}?

    +

    Are you sure you want to delete {{if @data.selectionList.isSingle 'this post' 'these posts'}}?

    diff --git a/ghost/admin/app/components/posts-list/modals/edit-posts-access.hbs b/ghost/admin/app/components/posts-list/modals/edit-posts-access.hbs index a802ebc8ff..edad61f68f 100644 --- a/ghost/admin/app/components/posts-list/modals/edit-posts-access.hbs +++ b/ghost/admin/app/components/posts-list/modals/edit-posts-access.hbs @@ -6,7 +6,6 @@
    - diff --git a/ghost/admin/app/components/posts-list/modals/unpublish-posts.hbs b/ghost/admin/app/components/posts-list/modals/unpublish-posts.hbs index 9111960837..b53e97c511 100644 --- a/ghost/admin/app/components/posts-list/modals/unpublish-posts.hbs +++ b/ghost/admin/app/components/posts-list/modals/unpublish-posts.hbs @@ -1,12 +1,12 @@
    -

    Are you sure you want to unpublish {{if @data.selectionList.isSingle 'this post' (concat @data.selectionList.count ' posts')}}?

    +

    Are you sure you want to unpublish {{if @data.selectionList.isSingle 'this post' 'these posts'}}?

    - You're about to unpublish {{if @data.selectionList.isSingle (concat '"' @data.selectionList.first.title '"') (concat @data.selectionList.count ' posts')}}. + You're about to revert {{if @data.selectionList.isSingle (concat '"' @data.selectionList.first.title '"') (concat @data.selectionList.count ' posts')}} to a private draft.

    diff --git a/ghost/admin/app/styles/components/dropdowns.css b/ghost/admin/app/styles/components/dropdowns.css index 1547765aa8..c0a70942ea 100644 --- a/ghost/admin/app/styles/components/dropdowns.css +++ b/ghost/admin/app/styles/components/dropdowns.css @@ -344,6 +344,35 @@ Post context menu .gh-context-menu { position: fixed; - max-width: 200px; + max-width: 160px; z-index: 1001; } + +.gh-posts-context-menu { + max-width: 160px !important; + border-radius: var(--border-radius); + box-shadow: + 0 0 2.3px rgba(0, 0, 0, 0.028), + 0 3.8px 7.8px rgba(0, 0, 0, 0.042), + 0 17px 35px -7px rgba(0, 0, 0, 0.11) + ; +} + +.gh-posts-context-menu li > button { + padding: 8px 16px; +} + +.gh-posts-context-menu li > button span { + display: flex; + align-items: center; + font-size: 1.35rem; +} + +.gh-posts-context-menu li > button span svg, +.gh-posts-context-menu li > button:hover span svg { + fill: none; +} + +.gh-posts-context-menu li > button span svg path { + stroke-width: 2px; +} \ No newline at end of file diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index 11472bad54..b206d177e4 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -184,11 +184,11 @@ } .posts-list[data-ctrl] .gh-posts-list-item-group:hover { - background: linear-gradient(315deg, var(--whitegrey-l1) 75%, var(--white) 100%); + background: linear-gradient(300deg, var(--whitegrey-l1) 75%, var(--white) 100%); } .gh-posts-list-item-group[data-selected] { - background: linear-gradient(315deg, var(--whitegrey-l1) 75%, var(--white) 100%) !important; + background: linear-gradient(300deg, var(--whitegrey-l1) 75%, var(--white) 100%) !important; } .gh-posts-list-item-group .gh-posts-list-item:hover .gh-list-data { @@ -265,9 +265,10 @@ } .gh-post-list-title .gh-featured-post { - width: 12px; - height: 12px; + width: 11px; + height: 11px; margin: -2px 6px 0 0; + color: var(--yellow-d2); } .gh-post-list-external { diff --git a/ghost/admin/app/styles/layouts/users.css b/ghost/admin/app/styles/layouts/users.css index 28072ea806..7c9e44fb34 100644 --- a/ghost/admin/app/styles/layouts/users.css +++ b/ghost/admin/app/styles/layouts/users.css @@ -159,6 +159,11 @@ .gh-badge.locked { background: none; + color: var(--midgrey); +} + +.gh-badge.locked svg path { + fill: none; } /* User invitation modal diff --git a/ghost/admin/app/styles/patterns/global.css b/ghost/admin/app/styles/patterns/global.css index 0d671d7a8a..33a3b67857 100644 --- a/ghost/admin/app/styles/patterns/global.css +++ b/ghost/admin/app/styles/patterns/global.css @@ -89,7 +89,7 @@ --yellow-l2: color-mod(var(--yellow) l(+10%)); --yellow-l1: color-mod(var(--yellow) l(+5%)); --yellow-d1: color-mod(var(--yellow) l(-5%)); - --yellow-d2: color-mod(var(--yellow) l(-10%)); + --yellow-d2: color-mod(var(--yellow) l(-7%)); --yellow-d3: color-mod(var(--yellow) l(-13%)); --red-l3: color-mod(var(--red) l(+15%)); diff --git a/ghost/admin/public/assets/icons/lock.svg b/ghost/admin/public/assets/icons/lock.svg index 1feec02568..c3efb1a841 100644 --- a/ghost/admin/public/assets/icons/lock.svg +++ b/ghost/admin/public/assets/icons/lock.svg @@ -1,5 +1,5 @@ - + lock - - + + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/star-fill.svg b/ghost/admin/public/assets/icons/star-fill.svg new file mode 100644 index 0000000000..0f7d33ddb5 --- /dev/null +++ b/ghost/admin/public/assets/icons/star-fill.svg @@ -0,0 +1,4 @@ + + star-fill + + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/star.svg b/ghost/admin/public/assets/icons/star.svg index bc12331cf0..9fb2f31035 100644 --- a/ghost/admin/public/assets/icons/star.svg +++ b/ghost/admin/public/assets/icons/star.svg @@ -1,3 +1,4 @@ - - + + star + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/undo.svg b/ghost/admin/public/assets/icons/undo.svg new file mode 100644 index 0000000000..f42ca8a221 --- /dev/null +++ b/ghost/admin/public/assets/icons/undo.svg @@ -0,0 +1,5 @@ + + undo + + + \ No newline at end of file