From a353eed1c37a768a142f2111042e05b0637d63cb Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Sun, 30 Sep 2018 11:23:05 +1000
Subject: [PATCH] small fixes

---
 .../donations_category_settings.hbs               |  2 +-
 .../donations-category-header-widget.js.es6       |  4 +++-
 assets/stylesheets/discourse-donations.scss       | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/assets/javascripts/discourse/connectors/category-custom-settings/donations_category_settings.hbs b/assets/javascripts/discourse/connectors/category-custom-settings/donations_category_settings.hbs
index cb8a7c0..ca19e34 100644
--- a/assets/javascripts/discourse/connectors/category-custom-settings/donations_category_settings.hbs
+++ b/assets/javascripts/discourse/connectors/category-custom-settings/donations_category_settings.hbs
@@ -1,7 +1,7 @@
 {{#if siteSettings.discourse_donations_cause_category}}
   <section class='field'>
-    <label>{{i18n 'discourse_donations.cause.amounts.setting_label'}}</label>
     {{input type="checkbox" checked=category.custom_fields.donations_show_amounts}}
+    <span>{{i18n 'discourse_donations.cause.amounts.setting_label'}}</span>
   </section>
 
   <section class='field'>
diff --git a/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6 b/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6
index 801afc7..ec3ce2f 100644
--- a/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6
+++ b/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6
@@ -31,7 +31,7 @@ createWidget('category-header-widget', {
 
       let metadata = [];
 
-      if (category.donations_show_amounts) {
+      if (category.donations_total !== undefined) {
         metadata.push(donationDisplay(category.donations_total || 0, 'total'));
 
         if (Discourse.SiteSettings.discourse_donations_cause_month) {
@@ -65,7 +65,9 @@ createWidget('category-header-widget', {
             }
           }))
         );
+      }
 
+      if (metadata.length) {
         contents.push(h('div.donations-category-metadata', metadata));
       }
 
diff --git a/assets/stylesheets/discourse-donations.scss b/assets/stylesheets/discourse-donations.scss
index da967e5..938c147 100644
--- a/assets/stylesheets/discourse-donations.scss
+++ b/assets/stylesheets/discourse-donations.scss
@@ -116,7 +116,7 @@ div.stripe-errors {
   .donations-category-contents {
     width: 500px;
     margin: 0 auto;
-    padding: 40px 40px 10px;
+    padding: 30px 40px 10px;
     text-align: center;
 
     i {
@@ -128,12 +128,21 @@ div.stripe-errors {
       text-transform: capitalize;
       display: inline;
     }
+
+    .category-title-description {
+      font-size: 1.2rem;
+      padding: 10px 0;
+
+      p {
+        margin: 0;
+      }
+    }
   }
 
   .donations-category-metadata {
     width: 500px;
     margin: 0 auto;
-    padding-bottom: 30px;
+    padding-bottom: 20px;
     display: flex;
     justify-content: space-around;
     font-size: 1.2rem;
@@ -163,7 +172,7 @@ div.stripe-errors {
     width: 500px;
     margin: 0 auto;
     font-size: 1.2rem;
-    padding-bottom: 40px;
+    padding-bottom: 30px;
     display: flex;
     align-items: center;