@@ -98,26 +97,20 @@
{{parsedEvent.subject}}
- {{svg-jar parsedEvent.icon}}
+ {{svg-jar parsedEvent.icon }}
- {{capitalize-first-letter parsedEvent.action}}
- {{#if parsedEvent.url}}
- {{parsedEvent.object}}
- {{/if}}
- {{#if parsedEvent.info}}
- {{parsedEvent.info}}
- {{/if}}
+
+ {{capitalize-first-letter parsedEvent.action}}
+ {{#if parsedEvent.info}}
+ {{parsedEvent.info}}
+ {{/if}}
+ {{#if parsedEvent.url}}
+ {{parsedEvent.join}}
+ {{parsedEvent.object}}
+ {{/if}}
+
- {{#if (feature "memberAttribution")}}
-
- {{/if}}
{{moment-from-now parsedEvent.timestamp}}
diff --git a/ghost/admin/app/components/gh-member-details.hbs b/ghost/admin/app/components/gh-member-details.hbs
index 6417bdc84a..e0435b7f38 100644
--- a/ghost/admin/app/components/gh-member-details.hbs
+++ b/ghost/admin/app/components/gh-member-details.hbs
@@ -49,7 +49,7 @@
{{#if (and @member.attribution @member.attribution.url @member.attribution.title) }}
{{svg-jar "satellite"}}
- Signed up to {{ @member.attribution.title }}
+ Signed up on {{ @member.attribution.title }}
{{/if}}
diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs
index f3fe5ea05e..38645a094c 100644
--- a/ghost/admin/app/components/member/activity-feed.hbs
+++ b/ghost/admin/app/components/member/activity-feed.hbs
@@ -24,16 +24,18 @@
-
- {{capitalize-first-letter event.action}}
+
+ {{capitalize-first-letter event.action}}
+ {{#if event.info}}
+ {{event.info}}
+ {{/if}}
{{#if event.url}}
- {{event.join}}
+ {{event.join}}
{{event.object}}
{{/if}}
{{#if event.email}}
{{/if}}
- {{event.info}}
diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs
index 3e79e15a05..ec65be123f 100644
--- a/ghost/admin/app/components/members-activity/table-row.hbs
+++ b/ghost/admin/app/components/members-activity/table-row.hbs
@@ -19,10 +19,10 @@
{{svg-jar event.icon}}
-
- {{capitalize-first-letter event.action}}
- {{#if (and event.url (not (feature "memberAttribution")))}}
- {{event.join}}
+
+ {{capitalize-first-letter event.action}}
+ {{#if event.url}}
+ {{event.join}}
{{event.object}}
{{/if}}
{{#if event.email}}
@@ -35,17 +35,6 @@
- {{#if (feature "memberAttribution")}}
-
- {{#if event.url}}
-
{{event.object}}
- {{else if event.email}}
-
- {{else}}
-
—
- {{/if}}
-
- {{/if}}
{{moment-format event.timestamp "DD MMM YYYY HH:mm"}}
{{/let}}
diff --git a/ghost/admin/app/components/members-activity/table.hbs b/ghost/admin/app/components/members-activity/table.hbs
index 4184c3be89..6633cbb935 100644
--- a/ghost/admin/app/components/members-activity/table.hbs
+++ b/ghost/admin/app/components/members-activity/table.hbs
@@ -5,9 +5,6 @@
Member |
{{/unless}}
Event |
- {{#if (feature "memberAttribution")}}
-
Attribution |
- {{/if}}
Time |
diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css
index 7a7760b4ce..281a4f5753 100644
--- a/ghost/admin/app/styles/layouts/dashboard.css
+++ b/ghost/admin/app/styles/layouts/dashboard.css
@@ -713,11 +713,6 @@ Dashboard List */
overflow: hidden;
}
-.gh-dashboard-list-subtext a {
- font-weight: 600;
- color: var(--darkgrey);
-}
-
.gh-dashboard-list-item svg {
width: 24px;
min-width: 24px;
diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css
index d56f67ca3a..53014d5428 100644
--- a/ghost/admin/app/styles/layouts/member-activity.css
+++ b/ghost/admin/app/styles/layouts/member-activity.css
@@ -153,11 +153,37 @@
overflow: hidden;
}
+.gh-members-activity-description.feature-memberAttribution {
+ color: var(--darkgrey);
+}
+
+.gh-members-activity-description.feature-memberAttribution a {
+ font-weight: 400;
+ color: var(--midgrey) !important;
+ text-decoration: underline;
+ text-decoration-color: var(--midlightgrey);
+ transition: all 150ms ease;
+}
+
+.gh-members-activity-description.feature-memberAttribution a:hover {
+ color: var(--middarkgrey) !important;
+}
+
.gh-members-activity-description a {
font-weight: 600;
color: var(--darkgrey);
}
+.gh-members-activity-event-join {
+ font-weight: 500;
+ color: var(--middarkgrey);
+}
+
+.feature-memberAttribution .gh-members-activity-event-join {
+ font-weight: 400;
+ color: var(--midgrey);
+}
+
.gh-members-activity-icon {
width: 24px;
min-width: 24px;
diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css
index 0d8201c20d..2b47833bc2 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -1186,12 +1186,6 @@ textarea.gh-member-details-textarea {
height: 100%;
}
-.gh-member-settings .gh-members-activity-description {
- font-weight: 500;
- font-size: 1.4rem;
- color: var(--middarkgrey);
-}
-
.gh-member-feed-time {
font-weight: 500;
font-size: 1.3rem;