diff --git a/ghost/admin/app/components/gh-member-details-activity.hbs b/ghost/admin/app/components/gh-member-details-activity.hbs index d0ca5d39eb..d0785a7a82 100644 --- a/ghost/admin/app/components/gh-member-details-activity.hbs +++ b/ghost/admin/app/components/gh-member-details-activity.hbs @@ -28,7 +28,7 @@ {{/if}}

- {{svg-jar "members"}} See member details + See all details →

diff --git a/ghost/admin/app/styles/components/lists.css b/ghost/admin/app/styles/components/lists.css index f460f854cf..f937b9db59 100644 --- a/ghost/admin/app/styles/components/lists.css +++ b/ghost/admin/app/styles/components/lists.css @@ -407,10 +407,10 @@ ul.nostyle li { .gh-list-scrolling { max-width: calc(100% + 8vw); height: calc(100vh - 193px); - margin-left: -4vw; + margin-left: 0; margin-right: -4vw; - padding-left: 48px; - padding-right: 0; + padding-left: 0; + padding-right: 4vw; } } diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css index 8984c7a038..0d7e47ee01 100644 --- a/ghost/admin/app/styles/layouts/member-activity.css +++ b/ghost/admin/app/styles/layouts/member-activity.css @@ -1,26 +1,30 @@ -.gh-members-activity { +.gh-members-activity.gh-canvas { + padding-left: 48px; + padding-right: 48px; + margin: 0; width: 100%; max-width: 100%; +} + +.gh-members-activity .gh-list, +.gh-members-activity .gh-canvas-header-content, +.gh-members-activity .gh-member-details-activity { + max-width: calc(1320px - 48px - 48px); + margin: 0 auto; padding-left: 0; padding-right: 0; } -.gh-members-activity .gh-canvas-header { - padding-left: 48px; - padding-right: 48px; - margin: 0 auto; - max-width: 1320px; +.gh-members-activity .gh-list-scrolling { + height: calc(100vh - 96px); } -.gh-member-details-activity { - margin: 0 auto; - max-width: 1320px; +.gh-members-activity-single .gh-list-scrolling { + height: calc(100vh - 96px - 116px); } .gh-member-details-activity .gh-main-section-block { - padding: 15px 0 20px; - margin: 0 48px; - border-top: 1px solid var(--whitegrey); + padding: 16px 0 20px; } .gh-member-details-activity .gh-main-section-content { @@ -28,7 +32,7 @@ } .gh-member-details-activity h3 { - margin: 0 0 3px; + margin: 0 0 2px; padding: 0; font-size: 1.6rem; font-weight: 600; @@ -78,24 +82,12 @@ color: var(--midgrey); } -.gh-members-activity .gh-list-scrolling { - height: calc(100vh - 96px); - margin-left: 0; - margin-right: 0; -} - -.gh-members-activity .gh-list-scrolling { - height: calc(100vh - 96px); -} - -.gh-members-activity .gh-list-scrolling .gh-list { - padding: 0 48px 48px; - margin: 0 auto; - max-width: 1320px; -} - .gh-members-activity .gh-list-scrolling thead th:last-child { - width: 25%; + width: 18%; +} + +.gh-members-activity .gh-list-scrolling tbody .gh-list-data:last-child { + white-space: nowrap; } .gh-members-activity:not(.gh-members-activity-single) .gh-list-data { @@ -161,17 +153,7 @@ font-weight: 400; font-size: 13px; color: var(--middarkgrey); -} - -@media (max-width: 1450px) { - .gh-members-activity .gh-canvas-header.break.tablet .gh-canvas-header-content { - height: 95px; - border-bottom: 0; - align-items: center; - } - .gh-members-activity .gh-canvas-header.break.tablet .gh-canvas-title { - margin-top: -3px; - } + white-space: nowrap; } .gh-member-activity-actions-menu { @@ -185,10 +167,6 @@ margin-bottom: 0.75rem; } -.gh-member-activity-actions-menu h3 { - margin-bottom: 0.75rem; -} - .gh-member-activity-actions-menu { cursor: default; } @@ -283,3 +261,37 @@ font-weight: 400; color: var(--middarkgrey); } + +@media (max-width: 800px) { + .gh-members-activity.gh-canvas { + padding-left: 0; + padding-right: 0; + } + + .gh-members-activity .gh-canvas-header-content, + .gh-members-activity .gh-member-details-activity { + max-width: calc(100% - 4vw - 4vw); + } + + .gh-members-activity-single .gh-list-scrolling { + height: calc(100vh - 96px - 116px -64px); + } + + .gh-members-activity .gh-list-scrolling { + margin-left: 4vw; + margin-right: 0; + padding-left: 0; + padding-right: 4vw; + } +} + +@media (max-width: 1450px) { + .gh-members-activity .gh-canvas-header.break.tablet .gh-canvas-header-content { + height: 95px; + border-bottom: 0; + align-items: center; + } + .gh-members-activity .gh-canvas-header.break.tablet .gh-canvas-title { + margin-top: -3px; + } +} diff --git a/ghost/admin/app/templates/members-activity.hbs b/ghost/admin/app/templates/members-activity.hbs index 24f9991f68..a23b674d65 100644 --- a/ghost/admin/app/templates/members-activity.hbs +++ b/ghost/admin/app/templates/members-activity.hbs @@ -1,5 +1,5 @@
- +

Activity {{#if this.memberRecord}} @@ -9,42 +9,39 @@

-
- + - -
+
-
-
- {{#let (members-event-fetcher filter=(members-event-filter excludedEvents=this.fullExcludedEvents member=this.member) pageSize=50) as |eventsFetcher|}} - {{#if eventsFetcher.data}} - {{#if this.memberRecord}} - - {{/if}} + {{#let (members-event-fetcher filter=(members-event-filter excludedEvents=this.fullExcludedEvents member=this.member) pageSize=50) as |eventsFetcher|}} + {{#if eventsFetcher.data}} + {{#if this.memberRecord}} + + {{/if}} +
{{#if (not (or eventsFetcher.isLoading eventsFetcher.hasReachedEnd))}} {{/if}} - {{else}} - {{#unless eventsFetcher.isLoading}} - - {{/unless}} - {{/if}} +
+ {{else}} + {{#unless eventsFetcher.isLoading}} + + {{/unless}} + {{/if}} - {{#if eventsFetcher.isLoading}} -
- {{/if}} - {{/let}} -
+ {{#if eventsFetcher.isLoading}} +
+ {{/if}} + {{/let}}
diff --git a/ghost/admin/public/assets/icons/event-subscriptions.svg b/ghost/admin/public/assets/icons/event-subscriptions.svg index 3a056ad824..18684b6a96 100644 --- a/ghost/admin/public/assets/icons/event-subscriptions.svg +++ b/ghost/admin/public/assets/icons/event-subscriptions.svg @@ -1,5 +1,4 @@ -