Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Member product list cleanup

Browse source
This commit is contained in:
Peter Zimon 2021-05-05 15:58:47 +02:00
parent 18696a6ee4
commit cf215328a4
2 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/admin/app/components/gh-member-settings-form-cp.hbs
View file

@ -119,11 +119,11 @@
{{#each this.products as |product|}} {{#each this.products as |product|}}
<div class="gh-main-section-content bordered"> <div class="gh-main-section-content bordered">
<div class="gh-cp-memberproduct"> <div class="gh-cp-memberproduct {{if (not (eq product.subscriptions.length 1)) "multiple-subs" ""}}">
<h3 class="gh-memberproduct-name"> <h3 class="gh-memberproduct-name">
{{product.name}} {{product.name}}
{{#unless (eq product.subscriptions.length 1)}} {{#unless (eq product.subscriptions.length 1)}}
<span class="gh-memberproduct-subcount">({{product.subscriptions.length}} subscriptions)</span> <span class="gh-memberproduct-subcount">{{product.subscriptions.length}} subscriptions</span>
{{/unless}} {{/unless}}
</h3> </h3>
{{#each product.subscriptions as |sub|}} {{#each product.subscriptions as |sub|}}

44
ghost/admin/app/styles/layouts/members.css
View file

@ -1568,38 +1568,26 @@ p.gh-members-import-errordetail:first-of-type {
/* Member's product list */ /* Member's product list */
.gh-memberproduct-name { .gh-memberproduct-name {
display: flex;
justify-content: space-between;
font-size: 1.5rem; font-size: 1.5rem;
margin-bottom: 4px !important; margin-bottom: 4px !important;
} }
.gh-memberproduct-actionlist { .gh-cp-memberproduct.multiple-subs .gh-memberproduct-name {
display: flex; margin-bottom: 8px !important;
align-items: center; }
justify-content: flex-end;
width: 100%; .gh-memberproduct-subcount {
opacity: 0; font-size: 1.25rem;
font-weight: 400;
color: var(--midgrey);
} }
.gh-memberproduct-list .gh-list-row:hover { .gh-memberproduct-list .gh-list-row:hover {
background: none !important; background: none !important;
} }
.gh-memberproduct-list .gh-list-row:hover .gh-memberproduct-actionlist {
opacity: 1;
}
.gh-memberproduct-actionlist a,
.gh-memberproduct-actionlist button {
line-height: 0;
margin-left: 24px;
color: var(--darkgrey);
font-weight: 500;
}
.gh-memberproduct-actionlist button.archive {
color: var(--red);
}
.gh-cp-memberproduct-pricelabel { .gh-cp-memberproduct-pricelabel {
font-weight: 600; font-weight: 600;
} }
@ -1610,7 +1598,7 @@ p.gh-members-import-errordetail:first-of-type {
font-size: 1.2rem; font-size: 1.2rem;
} }
.gh-memberproduct-subscription:not(:first-of-type) { .gh-cp-memberproduct.multiple-subs .gh-memberproduct-subscription {
margin-top: 12px; margin-top: 12px;
padding-top: 12px; padding-top: 12px;
border-top: 1px solid var(--whitegrey); border-top: 1px solid var(--whitegrey);
@ -1681,8 +1669,8 @@ p.gh-members-import-errordetail:first-of-type {
right: 0; right: 0;
} }
.gh-memberproduct-subscription:not(:first-of-type) .action-menu { .gh-cp-memberproduct.multiple-subs .gh-memberproduct-subscription .action-menu {
top: 18px; top: 20px;
} }
.gh-memberproduct-subscription .action-menu > .gh-btn span { .gh-memberproduct-subscription .action-menu > .gh-btn span {
@ -1692,9 +1680,3 @@ p.gh-members-import-errordetail:first-of-type {
.gh-memberproduct-subscription .action-menu > .gh-btn svg { .gh-memberproduct-subscription .action-menu > .gh-btn svg {
margin: 0; margin: 0;
} }
.gh-memberproduct-subcount {
font-size: 1.4rem;
font-weight: 400;
color: var(--midgrey);
}