From 3d3653b09a3cfe4251882312f772407fd8bcbf5f Mon Sep 17 00:00:00 2001 From: James Morris Date: Thu, 27 Oct 2022 17:01:37 +0100 Subject: [PATCH] Removed links from sources and added a prefix icon refs https://github.com/TryGhost/Team/issues/2183 --- .../components/posts/post-activity-feed.hbs | 10 ++---- ghost/admin/app/helpers/parse-member-event.js | 6 ++-- ghost/admin/app/styles/layouts/content.css | 36 ++++++++++++++++--- ...eled-subscription--feature-attribution.svg | 1 - .../icons/event-canceled-subscription.svg | 1 - .../event-comment--feature-attribution.svg | 1 - .../public/assets/icons/event-comment.svg | 1 - ...l-delivery-failed--feature-attribution.svg | 1 - .../icons/event-email-delivery-failed.svg | 1 - .../assets/icons/event-extras-source.svg | 4 +++ .../event-logged-in--feature-attribution.svg | 1 - .../public/assets/icons/event-logged-in.svg | 1 - ...nt-made-a-payment--feature-attribution.svg | 1 - .../assets/icons/event-made-a-payment.svg | 1 - ...vent-opened-email--feature-attribution.svg | 1 - .../assets/icons/event-opened-email.svg | 1 - ...nt-received-email--feature-attribution.svg | 1 - .../assets/icons/event-received-email.svg | 1 - .../event-signed-up--feature-attribution.svg | 1 - .../public/assets/icons/event-signed-up.svg | 1 - ...rted-subscription--feature-attribution.svg | 1 - ...bscribed-to-email--feature-attribution.svg | 1 - .../icons/event-subscribed-to-email.svg | 1 - ...ent-subscriptions--feature-attribution.svg | 1 - .../assets/icons/event-subscriptions.svg | 1 - ...cribed-from-email--feature-attribution.svg | 1 - .../icons/event-unsubscribed-from-email.svg | 1 - 27 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 ghost/admin/public/assets/icons/event-extras-source.svg diff --git a/ghost/admin/app/components/posts/post-activity-feed.hbs b/ghost/admin/app/components/posts/post-activity-feed.hbs index 08d21148ab..102c090ffc 100644 --- a/ghost/admin/app/components/posts/post-activity-feed.hbs +++ b/ghost/admin/app/components/posts/post-activity-feed.hbs @@ -40,7 +40,7 @@ {{else}} -
+
{{#each eventsFetcher.data as |event|}} {{#let (parse-member-event event) as |parsedEvent|}}
@@ -54,7 +54,7 @@ {{capitalize-first-letter parsedEvent.action}} {{#if parsedEvent.info}} - {{parsedEvent.info}} +  ({{parsedEvent.info}}) {{/if}} @@ -62,11 +62,7 @@ {{#if (eq this.eventType "conversion")}}
{{#if parsedEvent.source}} - {{#if parsedEvent.source.url}} - {{parsedEvent.source.name}} - {{else}} - {{parsedEvent.source.name}} - {{/if}} + {{svg-jar "event-extras-source"}}{{parsedEvent.source.name}} {{else}} — {{/if}} diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js index 76d4b958e6..11b1c05757 100644 --- a/ghost/admin/app/helpers/parse-member-event.js +++ b/ghost/admin/app/helpers/parse-member-event.js @@ -262,14 +262,14 @@ export default class ParseMemberEventHelper extends Helper { if (event.data.type === 'created') { const sign = mrrDelta > 0 ? '' : '-'; const tierName = this.membersUtils.hasMultipleTiers ? (event.data.tierName ?? 'paid') : 'paid'; - return `(${tierName} - ${sign}${symbol}${Math.abs(mrrDelta)}/month)`; + return `${tierName} - ${sign}${symbol}${Math.abs(mrrDelta)}/month`; } const sign = mrrDelta > 0 ? '+' : '-'; - return `(MRR - ${sign}${symbol}${Math.abs(mrrDelta)})`; + return `MRR - ${sign}${symbol}${Math.abs(mrrDelta)}`; } if (event.type === 'signup_event' && this.membersUtils.paidMembersEnabled) { - return '(free)'; + return 'Free'; } return; diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index 519fba22d1..1e3b346fbb 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -1356,6 +1356,23 @@ a.gh-post-list-signups.active:hover > span, a.gh-post-list-conversions.active:ho } } +.gh-dashboard-list-item-sub .gh-members-activity-description { + display: flex; + flex-direction: row; + align-items: center; +} + +.gh-dashboard-list-item-sub .gh-members-activity-description svg { + width: 18px; + min-width: 18px; + height: 16px; + margin: 0 0.4em 0 0; +} + +.gh-dashboard-list-item-sub .gh-members-activity-description svg path { + stroke: var(--midgrey); +} + /* Post list – LABS /* ---------------------------------------------------------- */ @@ -1641,7 +1658,7 @@ a.gh-post-list-cta.stats.is-hovered:hover > * { .gh-tabs-analytics .tab-panel-selected { display: block; - padding: 12px 26px 0; + padding: 8px 26px 0; /* help to hide shadow from selected tab */ opacity: 0.99999; background-color: #ffffff; @@ -1696,12 +1713,12 @@ a.gh-post-list-cta.stats.is-hovered:hover > * { grid-template-columns: 40% 40% 20%; } -.gh-tabs-analytics .gh-dashboard-list-larger-cols .gh-dashboard-list-item { +.gh-tabs-analytics .gh-dashboard-list-cols-clicked .gh-dashboard-list-item { grid-template-columns: 26% 54% 20%; } -.gh-tabs-analytics .gh-dashboard-list-four-cols .gh-dashboard-list-item { - grid-template-columns: 35% 25% 20% 20%; +.gh-tabs-analytics .gh-dashboard-list-cols-conversion .gh-dashboard-list-item { + grid-template-columns: 28% 28% 24% 20%; } .gh-post-activity-feed .gh-members-activity-description a { @@ -1950,6 +1967,17 @@ a.gh-post-list-cta.stats.is-hovered:hover > * { display: none; } +.gh-prefix { + padding: 0 0.5em 0 0; + line-height: 1em; + white-space: nowrap; + font-size: 1.1rem; + font-weight: 600; + letter-spacing: .03em; + color: var(--midgrey); + text-transform: uppercase; +} + @media (max-width: 1150px) { .gh-post-activity-feed { grid-template-columns: unset; diff --git a/ghost/admin/public/assets/icons/event-canceled-subscription--feature-attribution.svg b/ghost/admin/public/assets/icons/event-canceled-subscription--feature-attribution.svg index 36b45523b6..6b00a1f7ff 100644 --- a/ghost/admin/public/assets/icons/event-canceled-subscription--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-canceled-subscription--feature-attribution.svg @@ -1,5 +1,4 @@ - event-canceled-subscription--feature-attribution diff --git a/ghost/admin/public/assets/icons/event-canceled-subscription.svg b/ghost/admin/public/assets/icons/event-canceled-subscription.svg index b555364a80..b4ed19bd65 100644 --- a/ghost/admin/public/assets/icons/event-canceled-subscription.svg +++ b/ghost/admin/public/assets/icons/event-canceled-subscription.svg @@ -1,5 +1,4 @@ - event-canceled-subscription \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-comment--feature-attribution.svg b/ghost/admin/public/assets/icons/event-comment--feature-attribution.svg index 3fb274a71e..73b339fe26 100644 --- a/ghost/admin/public/assets/icons/event-comment--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-comment--feature-attribution.svg @@ -1,4 +1,3 @@ - event-comment--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-comment.svg b/ghost/admin/public/assets/icons/event-comment.svg index 0aa47ed601..e07c712b5a 100644 --- a/ghost/admin/public/assets/icons/event-comment.svg +++ b/ghost/admin/public/assets/icons/event-comment.svg @@ -1,4 +1,3 @@ - event-comment \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-email-delivery-failed--feature-attribution.svg b/ghost/admin/public/assets/icons/event-email-delivery-failed--feature-attribution.svg index fe84eef229..ee43e4b6da 100644 --- a/ghost/admin/public/assets/icons/event-email-delivery-failed--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-email-delivery-failed--feature-attribution.svg @@ -1,5 +1,4 @@ - event-email-delivery-failed--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-email-delivery-failed.svg b/ghost/admin/public/assets/icons/event-email-delivery-failed.svg index 003e8bf8b1..867db3dcf5 100644 --- a/ghost/admin/public/assets/icons/event-email-delivery-failed.svg +++ b/ghost/admin/public/assets/icons/event-email-delivery-failed.svg @@ -1,5 +1,4 @@ - event-email-delivery-failed \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-extras-source.svg b/ghost/admin/public/assets/icons/event-extras-source.svg new file mode 100644 index 0000000000..ee3ef784aa --- /dev/null +++ b/ghost/admin/public/assets/icons/event-extras-source.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ghost/admin/public/assets/icons/event-logged-in--feature-attribution.svg b/ghost/admin/public/assets/icons/event-logged-in--feature-attribution.svg index cdfe108840..5daed6b560 100644 --- a/ghost/admin/public/assets/icons/event-logged-in--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-logged-in--feature-attribution.svg @@ -1,5 +1,4 @@ - event-logged-in--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-logged-in.svg b/ghost/admin/public/assets/icons/event-logged-in.svg index a50b68dd68..4110b00401 100644 --- a/ghost/admin/public/assets/icons/event-logged-in.svg +++ b/ghost/admin/public/assets/icons/event-logged-in.svg @@ -1,5 +1,4 @@ - event-logged-in \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-made-a-payment--feature-attribution.svg b/ghost/admin/public/assets/icons/event-made-a-payment--feature-attribution.svg index 1e9e18fb40..ce6de72a26 100644 --- a/ghost/admin/public/assets/icons/event-made-a-payment--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-made-a-payment--feature-attribution.svg @@ -1,5 +1,4 @@ - event-made-a-payment--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-made-a-payment.svg b/ghost/admin/public/assets/icons/event-made-a-payment.svg index 719ec509d8..dc663a9d6c 100644 --- a/ghost/admin/public/assets/icons/event-made-a-payment.svg +++ b/ghost/admin/public/assets/icons/event-made-a-payment.svg @@ -1,5 +1,4 @@ - event-made-a-payment \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-opened-email--feature-attribution.svg b/ghost/admin/public/assets/icons/event-opened-email--feature-attribution.svg index aa8798c807..3765bd3917 100644 --- a/ghost/admin/public/assets/icons/event-opened-email--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-opened-email--feature-attribution.svg @@ -1,5 +1,4 @@ - event-opened-email--feature-attribution diff --git a/ghost/admin/public/assets/icons/event-opened-email.svg b/ghost/admin/public/assets/icons/event-opened-email.svg index 23ce6eefcc..d302b2405c 100644 --- a/ghost/admin/public/assets/icons/event-opened-email.svg +++ b/ghost/admin/public/assets/icons/event-opened-email.svg @@ -1,5 +1,4 @@ - event-opened-email diff --git a/ghost/admin/public/assets/icons/event-received-email--feature-attribution.svg b/ghost/admin/public/assets/icons/event-received-email--feature-attribution.svg index 1daae5e1ce..ad2166afc7 100644 --- a/ghost/admin/public/assets/icons/event-received-email--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-received-email--feature-attribution.svg @@ -1,5 +1,4 @@ - event-received-email--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-received-email.svg b/ghost/admin/public/assets/icons/event-received-email.svg index af32fca7a8..5516cd0b53 100644 --- a/ghost/admin/public/assets/icons/event-received-email.svg +++ b/ghost/admin/public/assets/icons/event-received-email.svg @@ -1,5 +1,4 @@ - event-received-email \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-signed-up--feature-attribution.svg b/ghost/admin/public/assets/icons/event-signed-up--feature-attribution.svg index 98675e9096..215e325ae1 100644 --- a/ghost/admin/public/assets/icons/event-signed-up--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-signed-up--feature-attribution.svg @@ -1,5 +1,4 @@ - event-signed-up--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-signed-up.svg b/ghost/admin/public/assets/icons/event-signed-up.svg index 4fbba22b1f..b159d08f9c 100644 --- a/ghost/admin/public/assets/icons/event-signed-up.svg +++ b/ghost/admin/public/assets/icons/event-signed-up.svg @@ -1,5 +1,4 @@ - event-signed-up \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-started-subscription--feature-attribution.svg b/ghost/admin/public/assets/icons/event-started-subscription--feature-attribution.svg index f4d988546c..12f6864101 100644 --- a/ghost/admin/public/assets/icons/event-started-subscription--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-started-subscription--feature-attribution.svg @@ -1,5 +1,4 @@ - event-started-subscription--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-subscribed-to-email--feature-attribution.svg b/ghost/admin/public/assets/icons/event-subscribed-to-email--feature-attribution.svg index 73b8762a61..88e5aeb99f 100644 --- a/ghost/admin/public/assets/icons/event-subscribed-to-email--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-subscribed-to-email--feature-attribution.svg @@ -1,5 +1,4 @@ - event-subscribed-to-email--feature-attribution diff --git a/ghost/admin/public/assets/icons/event-subscribed-to-email.svg b/ghost/admin/public/assets/icons/event-subscribed-to-email.svg index 738c8ed1ee..986f171723 100644 --- a/ghost/admin/public/assets/icons/event-subscribed-to-email.svg +++ b/ghost/admin/public/assets/icons/event-subscribed-to-email.svg @@ -1,5 +1,4 @@ - event-subscribed-to-email diff --git a/ghost/admin/public/assets/icons/event-subscriptions--feature-attribution.svg b/ghost/admin/public/assets/icons/event-subscriptions--feature-attribution.svg index 5c8bd304d2..cea8380ce2 100644 --- a/ghost/admin/public/assets/icons/event-subscriptions--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-subscriptions--feature-attribution.svg @@ -1,4 +1,3 @@ - event-subscriptions--feature-attribution \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-subscriptions.svg b/ghost/admin/public/assets/icons/event-subscriptions.svg index fc9acd916f..05f4f83160 100644 --- a/ghost/admin/public/assets/icons/event-subscriptions.svg +++ b/ghost/admin/public/assets/icons/event-subscriptions.svg @@ -1,4 +1,3 @@ - event-subscriptions \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/event-unsubscribed-from-email--feature-attribution.svg b/ghost/admin/public/assets/icons/event-unsubscribed-from-email--feature-attribution.svg index 4c6ba6746a..f5c537adf2 100644 --- a/ghost/admin/public/assets/icons/event-unsubscribed-from-email--feature-attribution.svg +++ b/ghost/admin/public/assets/icons/event-unsubscribed-from-email--feature-attribution.svg @@ -1,5 +1,4 @@ - event-unsubscribed-from-email--feature-attribution diff --git a/ghost/admin/public/assets/icons/event-unsubscribed-from-email.svg b/ghost/admin/public/assets/icons/event-unsubscribed-from-email.svg index 6106716b88..04af79255b 100644 --- a/ghost/admin/public/assets/icons/event-unsubscribed-from-email.svg +++ b/ghost/admin/public/assets/icons/event-unsubscribed-from-email.svg @@ -1,5 +1,4 @@ - event-unsubscribed-from-email