From 836010c0f2ed24e56ced6b0d3ae2c69b9436f445 Mon Sep 17 00:00:00 2001
From: Djordje Vlaisavljevic <dzvlais@gmail.com>
Date: Fri, 7 Oct 2022 11:12:52 +0200
Subject: [PATCH] Added back both columns to the all sources modal

refs https://github.com/TryGhost/Team/issues/1986
---
 .../components/member-attribution/modals/all-sources.hbs | 9 +--------
 ghost/admin/app/styles/layouts/dashboard.css             | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ghost/admin/app/components/member-attribution/modals/all-sources.hbs b/ghost/admin/app/components/member-attribution/modals/all-sources.hbs
index 4f7705b589..ea5f4520e8 100644
--- a/ghost/admin/app/components/member-attribution/modals/all-sources.hbs
+++ b/ghost/admin/app/components/member-attribution/modals/all-sources.hbs
@@ -7,13 +7,11 @@
     <div class="modal-body pa">
         <div>
             <div class="gh-dashboard-list-header">
-                {{#if (eq @data.sortColumn "signups")}} <div class="gh-dashboard-list-title">Sources</div> {{/if}}
+                <div class="gh-dashboard-list-title">Sources</div>
                 <div class="gh-dashboard-list-title">Free signups</div>
-                {{#if (eq @data.sortColumn "paid")}}
                     {{#if this.membersUtils.paidMembersEnabled}}
                         <div class="gh-dashboard-list-title"><span class="hide-when-small">Paid </span>Conversions</div>
                     {{/if}}
-                {{/if}}
             </div>
             <div class="gh-dashboard-list-body">
                 <div class="gh-dashboard-attribution-list-scrollable">
@@ -22,7 +20,6 @@
                             <div class="gh-dashboard-list-item-sub gh-dashboard-list-item-sub-source">
                                 <span class="gh-dashboard-list-text">{{sourceData.source}}<sup>*</sup></span>
                             </div>
-                            {{#if (eq @data.sortColumn "signups")}}
                             <div class="gh-dashboard-list-item-sub">
                                 <span class="gh-dashboard-metric-minivalue">
                                     {{#if sourceData.signups}}
@@ -32,8 +29,6 @@
                                     {{/if}}
                                 </span>
                             </div>
-                            {{/if}}
-                            {{#if (eq @data.sortColumn "paid")}}
                                 {{#if this.membersUtils.paidMembersEnabled}}
                                     <div class="gh-dashboard-list-item-sub">
                                         <span class="gh-dashboard-metric-minivalue">
@@ -45,7 +40,6 @@
                                         </span>
                                     </div>
                                 {{/if}}
-                            {{/if}}
                         </div>
                     {{else}}
                         <div class="gh-dashboard-list-empty">
@@ -57,7 +51,6 @@
         </div>
 
     </div>
-
     <div class="modal-footer">
         <p class="gh-dashboard-attribution-footnote"><sup>*</sup>{{if (eq @data.sortColumn "paid") "Paid subscriptions" "Members"}} created during this time period that do not have attribution data associated with them.</p>
     </div>
diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css
index 0c37dc941e..ff66c5fc89 100644
--- a/ghost/admin/app/styles/layouts/dashboard.css
+++ b/ghost/admin/app/styles/layouts/dashboard.css
@@ -1249,11 +1249,9 @@ Dashboard Attribution */
 }
 
 .gh-all-sources .gh-dashboard-list-header {
-    grid-template-columns: 70% 30%;
 }
 
 .gh-all-sources .gh-dashboard-list-item {
-    grid-template-columns: 70% 30%;
 }
 
 .gh-all-sources .modal-footer {