From 8eee71f2d67c541f10443450534a7138985e643f Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Fri, 7 May 2021 17:45:59 +0200
Subject: [PATCH] Refined archive/unarchive prices

---
 ghost/admin/app/styles/layouts/products.css    | 12 ++++++++----
 ghost/admin/app/templates/settings/product.hbs |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/app/styles/layouts/products.css b/ghost/admin/app/styles/layouts/products.css
index 027a9c9758..b9f7c2c882 100644
--- a/ghost/admin/app/styles/layouts/products.css
+++ b/ghost/admin/app/styles/layouts/products.css
@@ -209,12 +209,12 @@
 }
 
 .gh-price-list-name span.archived {
-    background: var(--midgrey);
-    color: #fff;
+    background: var(--lightgrey-l2);
+    color: var(--midgrey);
     font-size: 1.2rem;
 }
 
-.gh-price-list-archived .gh-price-list-name,
+.gh-price-list-archived .gh-price-list-name .name,
 .gh-price-list-archived .gh-price-list-description,
 .gh-price-list-archived .gh-price-list-price span,
 .gh-price-list-archived .gh-price-list-subscriptions span {
@@ -233,6 +233,10 @@
     left: auto;
 }
 
+.gh-btn-archive-toggle {
+    width: 80px;
+}
+
 .product-actions-menu.fade-out {
     animation-duration: 0.01s;
     pointer-events: none;
@@ -247,4 +251,4 @@
     display: grid;
     grid-template-columns: 1fr 2fr;
     grid-gap: 20px;
-}
+}
\ No newline at end of file
diff --git a/ghost/admin/app/templates/settings/product.hbs b/ghost/admin/app/templates/settings/product.hbs
index 2d089b9e1e..218b2832e6 100644
--- a/ghost/admin/app/templates/settings/product.hbs
+++ b/ghost/admin/app/templates/settings/product.hbs
@@ -92,7 +92,10 @@
                 <li class="gh-list-row {{if price.active "" "gh-price-list-archived"}}">
                     <div class="gh-list-data gh-price-list-title">
                         <h3 class="gh-price-list-name">
-                            {{price.nickname}}
+                            <span class="name">{{price.nickname}}</span>
+                            {{#unless price.active}}
+                            <span class="gh-badge archived">Archived</span>
+                            {{/unless}}
                         </h3>
                         <p class="ma0 pa0 f8 midgrey gh-price-list-description">
                             {{price.description}}
@@ -109,11 +112,11 @@
                                 <span>Edit</span>
                             </button>
                             {{#if price.active}}
-                                <button class="gh-btn gh-btn-link archived" {{action "archivePrice" price}}>
+                                <button class="gh-btn gh-btn-link gh-btn-archive-toggle archived" {{action "archivePrice" price}}>
                                     <span>Archive</span>
                                 </button>
                             {{else}}
-                                <button class="gh-btn gh-btn-link" {{action "activatePrice" price}}>
+                                <button class="gh-btn gh-btn-link gh-btn-archive-toggle" {{action "activatePrice" price}}>
                                     <span>Activate</span>
                                 </button>
                             {{/if}}