From 986470847b79f49c1c486dc775d2b3f9a0ac71d8 Mon Sep 17 00:00:00 2001
From: Liam Johnston <liam.johnston@springload.co.nz>
Date: Wed, 19 Jun 2024 10:13:53 +1200
Subject: [PATCH] CMS UI improvements - heading component and logo

---
 static/images/cdh-logo-admin.svg   | 95 ++++++++++++++++++++++++++++++
 static/wagtailadmin/css/custom.css |  4 ++
 templates/wagtailadmin/base.html   |  3 +-
 3 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 static/images/cdh-logo-admin.svg
 create mode 100644 static/wagtailadmin/css/custom.css

diff --git a/static/images/cdh-logo-admin.svg b/static/images/cdh-logo-admin.svg
new file mode 100644
index 000000000..ff2d5b74f
--- /dev/null
+++ b/static/images/cdh-logo-admin.svg
@@ -0,0 +1,95 @@
+<svg width="160" height="120" viewBox="0 0 160 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M132 0.257935H0V91.2698H132V0.257935Z" fill="white" />
+  <path d="M132 0V91.2698H0L28 119.048H160V27.7778L132 0Z" fill="#00edff" />
+  <path d="M12.2998 12.7976H21.0598V14.5238H17.5798V25.4762H15.7598V14.5238H12.2998V12.7976Z" fill="black" />
+  <path
+    d="M31.9998 19.5039H24.8798V25.4762H23.0598V12.7976H24.8798V17.7777H31.9998V12.7976H33.8198V25.4762H31.9998V19.5039Z"
+    fill="black" />
+  <path
+    d="M43.2398 17.7777V19.5039H39.0398V23.75H44.6998V25.4762H37.1998V12.7976H44.4998V14.5238H39.0198V17.7777H43.2398Z"
+    fill="black" />
+  <path
+    d="M58.5998 12.619C60.4198 12.619 62.1598 13.3531 63.2798 14.5833L62.0598 15.7738C61.3198 14.9603 59.9798 14.3452 58.6198 14.3452C55.9998 14.3452 53.9798 16.4087 53.9798 19.1468C53.9798 22.0039 56.0598 23.9484 58.7798 23.9484C59.4855 23.9406 60.1806 23.7762 60.8139 23.4672C61.4472 23.1582 62.0028 22.7125 62.4398 22.1627L63.7398 23.3135C63.1384 24.0441 62.3823 24.6344 61.5251 25.0424C60.6678 25.4505 59.7306 25.6663 58.7798 25.6746C54.9598 25.6746 52.1598 22.8968 52.1598 19.1468C52.1398 15.4762 54.9198 12.619 58.5998 12.619Z"
+    fill="black" />
+  <path
+    d="M71.8398 17.7777V19.5039H67.6398V23.75H73.2998V25.4762H65.8198V12.7976H73.1198V14.5238H67.6398V17.7777H71.8398Z"
+    fill="black" />
+  <path
+    d="M77.5998 16.1706V25.4762H75.7798V12.7976H77.0598L84.7198 22.1031V12.7976H86.5398V25.4762H85.2598L77.5998 16.1706Z"
+    fill="black" />
+  <path d="M88.5398 12.7976H97.2998V14.5238H93.8398V25.4762H92.0198V14.5238H88.5598V12.7976H88.5398Z" fill="black" />
+  <path d="M105.34 17.7777V19.5039H101.14V23.75H106.8V25.4762H99.3198V12.7976H106.62V14.5238H101.14V17.7777H105.34Z"
+    fill="black" />
+  <path
+    d="M111.08 25.4762H109.26V12.7976H113.74C114.9 12.7976 115.64 13.0754 116.22 13.5317C116.613 13.8434 116.93 14.2389 117.148 14.6888C117.367 15.1388 117.48 15.6317 117.48 16.1309C117.48 16.6302 117.367 17.1231 117.148 17.573C116.93 18.0229 116.613 18.4184 116.22 18.7301C115.786 19.0788 115.27 19.3111 114.72 19.4047L119.3 25.4563H117.1L112.56 19.4841H111.08V25.4762ZM113.64 17.7777C114.46 17.7777 114.88 17.5992 115.18 17.3016C115.486 16.9957 115.659 16.5821 115.66 16.1508C115.661 15.9369 115.62 15.7249 115.537 15.5272C115.455 15.3296 115.333 15.1503 115.18 15C114.88 14.7024 114.46 14.5238 113.64 14.5238H111.08V17.7777H113.64Z"
+    fill="black" />
+  <path d="M19.6798 34.8412V36.5674H15.4798V42.5397H13.6598V29.8611H20.9598V31.5873H15.4798V34.8412H19.6798Z"
+    fill="black" />
+  <path
+    d="M28.2598 29.6825C31.8798 29.6825 34.6398 32.5 34.6398 36.2103C34.6398 39.9008 31.8598 42.7381 28.2598 42.7381C24.6398 42.7381 21.8798 39.9206 21.8798 36.2103C21.8798 32.5 24.6598 29.6825 28.2598 29.6825ZM28.2598 40.992C30.8798 40.992 32.8198 38.9484 32.8198 36.1904C32.8198 33.4524 30.8598 31.3889 28.2598 31.3889C25.6398 31.3889 23.6998 33.4524 23.6998 36.1904C23.6998 38.9484 25.6598 40.992 28.2598 40.992Z"
+    fill="black" />
+  <path
+    d="M38.8598 42.5397H37.0398V29.8611H41.5198C42.6798 29.8611 43.4198 30.1389 43.9998 30.5952C44.3929 30.9069 44.7103 31.3024 44.9284 31.7523C45.1465 32.2023 45.2598 32.6951 45.2598 33.1944C45.2598 33.6937 45.1465 34.1866 44.9284 34.6365C44.7103 35.0864 44.3929 35.4819 43.9998 35.7936C43.5663 36.1423 43.0498 36.3746 42.4998 36.4682L47.0798 42.5198H44.8798L40.3398 36.5476H38.8598V42.5397ZM41.3998 34.8412C42.2198 34.8412 42.6398 34.6627 42.9398 34.3651C43.2464 34.0592 43.4189 33.6456 43.4198 33.2143C43.4232 33.0001 43.3824 32.7875 43.2998 32.5896C43.2173 32.3917 43.0947 32.2126 42.9398 32.0635C42.6398 31.7658 42.2198 31.5873 41.3998 31.5873H38.8398V34.8412H41.3998Z"
+    fill="black" />
+  <path
+    d="M54.6198 42.5397V29.8611H58.4598C60.4798 29.8611 61.7998 30.2976 62.8398 31.0516C63.6404 31.6512 64.2888 32.4281 64.7332 33.3202C65.1777 34.2124 65.4059 35.1953 65.3998 36.1904C65.414 37.1849 65.1914 38.1686 64.75 39.0616C64.3087 39.9546 63.661 40.7316 62.8598 41.3293C61.8198 42.0833 60.4798 42.5198 58.4598 42.5198H54.6198V42.5397ZM61.9998 32.6587C61.1998 31.9643 60.1398 31.5873 58.3398 31.5873H56.4198V40.8135H58.3398C60.1198 40.8135 61.1798 40.4365 61.9998 39.742C62.4957 39.2912 62.8908 38.7421 63.1595 38.1304C63.4282 37.5186 63.5646 36.8577 63.5598 36.1904C63.569 35.5254 63.4346 34.8661 63.1655 34.2569C62.8964 33.6477 62.4989 33.1028 61.9998 32.6587Z"
+    fill="black" />
+  <path d="M67.7598 29.8611H69.5798V42.5397H67.7598V29.8611Z" fill="black" />
+  <path
+    d="M83.5398 40.3571C82.9355 41.0844 82.1787 41.6723 81.3222 42.0801C80.4656 42.4878 79.5298 42.7056 78.5798 42.7182C74.7598 42.7182 71.9598 39.9404 71.9598 36.1904C71.9598 32.5397 74.7398 29.6627 78.4198 29.6627C80.2398 29.6627 81.9798 30.3968 83.0998 31.627L81.8798 32.8174C81.1398 32.0039 79.7998 31.3889 78.4398 31.3889C75.8198 31.3889 73.7998 33.4524 73.7998 36.1904C73.7998 39.0476 75.8798 40.992 78.5998 40.992C79.7594 41.0175 80.8841 40.5982 81.7398 39.8214V36.5674H78.0798V34.8412H83.5598L83.5398 40.3571Z"
+    fill="black" />
+  <path d="M86.4598 29.8611H88.2798V42.5397H86.4598V29.8611Z" fill="black" />
+  <path d="M90.2998 29.8611H99.0598V31.5873H95.5998V42.5397H93.7798V31.5873H90.3198V29.8611H90.2998Z" fill="black" />
+  <path
+    d="M107.04 39.2857H101.66L100.32 42.5397H98.4198L103.72 29.8611H105L110.3 42.5397H108.4L107.04 39.2857ZM102.38 37.5595H106.32L104.34 32.8571L102.38 37.5595Z"
+    fill="black" />
+  <path d="M113.94 40.8135H119.6V42.5397H112.12V29.8611H113.94V40.8135Z" fill="black" />
+  <path
+    d="M22.5998 53.6111H15.4798V59.5833H13.6598V46.9047H15.4798V51.8849H22.5998V46.9047H24.4198V59.5833H22.5998V53.6111Z"
+    fill="black" />
+  <path
+    d="M28.3798 58.115C27.5598 57.2222 27.0398 56.0516 27.0398 54.3452V46.9246H28.8598V54.4444C28.8598 55.6349 29.1598 56.3889 29.6598 56.9444C30.0029 57.3018 30.4156 57.5863 30.8728 57.7807C31.33 57.9751 31.8223 58.0754 32.3198 58.0754C32.8173 58.0754 33.3096 57.9751 33.7668 57.7807C34.224 57.5863 34.6367 57.3018 34.9798 56.9444C35.4998 56.3889 35.7798 55.6349 35.7798 54.4444V46.9246H37.5998V54.3452C37.5998 56.0516 37.0798 57.2222 36.2598 58.115C35.7502 58.6474 35.1357 59.0701 34.4544 59.3568C33.7732 59.6435 33.0398 59.7881 32.2998 59.7817C31.5657 59.788 30.8383 59.6432 30.1636 59.3563C29.4888 59.0694 28.8814 58.6468 28.3798 58.115Z"
+    fill="black" />
+  <path
+    d="M46.6798 56.8849H45.3998L41.6598 51.0714V59.6031H39.8398V46.9246H41.1198L46.0398 54.6627L50.9598 46.9246H52.2398V59.6031H50.4198V51.0714L46.6798 56.8849Z"
+    fill="black" />
+  <path
+    d="M62.4998 56.3293H57.1198L55.7798 59.5833H53.8798L59.1798 46.9047H60.4598L65.7598 59.5833H63.8598L62.4998 56.3293ZM57.8598 54.623H61.7998L59.8198 49.9206L57.8598 54.623Z"
+    fill="black" />
+  <path
+    d="M69.2198 50.2976V59.6031H67.3998V46.9246H68.6798L76.3398 56.2301V46.9246H78.1598V59.6031H76.8798L69.2198 50.2976Z"
+    fill="black" />
+  <path d="M81.3598 46.9246H83.1798V59.6031H81.3598V46.9246Z" fill="black" />
+  <path d="M85.8998 46.9246H94.6598V48.6508H91.1998V59.6031H89.3798V48.6508H85.9198V46.9246H85.8998Z" fill="black" />
+  <path d="M96.9798 46.9246H98.7998V59.6031H96.9798V46.9246Z" fill="black" />
+  <path d="M108.12 51.9047V53.6309H103.92V57.877H109.58V59.6031H102.1V46.9246H109.4V48.6508H103.92V51.9047H108.12Z"
+    fill="black" />
+  <path
+    d="M112.12 56.4285C112.86 57.3412 113.92 58.0555 115.24 58.0555C116.42 58.0555 117.46 57.3016 117.46 56.1508C117.46 54.2063 114.76 53.9881 113.06 52.8968C112.14 52.3016 111.44 51.4285 111.44 50.0992C111.44 48.2539 113.08 46.7262 115.3 46.7262C116.562 46.732 117.781 47.182 118.74 47.996L117.66 49.3254C117.028 48.7761 116.22 48.4668 115.38 48.4524C114.32 48.4524 113.26 49.0476 113.26 50.1587C113.26 51.7658 115.98 52.123 117.62 53.1944C118.48 53.75 119.28 54.6428 119.28 56.0912C119.28 58.3135 117.54 59.7619 115.32 59.7619C114.46 59.765 113.611 59.5757 112.835 59.2081C112.06 58.8405 111.378 58.3041 110.84 57.6389L112.12 56.4285Z"
+    fill="black" />
+  <path
+    d="M26.2598 71.0317V76.6468H24.4398V63.9682H29.2798C30.5198 63.9682 31.3198 64.2857 31.9398 64.8016C32.3347 65.1336 32.6519 65.547 32.8695 66.013C33.0871 66.479 33.1998 66.9864 33.1998 67.5C33.1998 68.0135 33.0871 68.5209 32.8695 68.9869C32.6519 69.4529 32.3347 69.8663 31.9398 70.1984C31.3198 70.7143 30.5198 71.0317 29.2798 71.0317H26.2598ZM29.1798 69.3254C30.0598 69.3254 30.5398 69.1071 30.8598 68.7698C31.1928 68.4377 31.3798 67.9883 31.3798 67.5198C31.3798 67.0513 31.1928 66.6019 30.8598 66.2698C30.5398 65.9325 30.0598 65.7143 29.1798 65.7143H26.2598V69.3452H29.1798V69.3254Z"
+    fill="black" />
+  <path
+    d="M36.7598 70.6746V76.6468H34.9398V63.9682H39.3998C40.5598 63.9682 41.2998 64.246 41.8798 64.7024C42.2729 65.0141 42.5903 65.4095 42.8084 65.8595C43.0265 66.3094 43.1398 66.8023 43.1398 67.3016C43.1398 67.8008 43.0265 68.2937 42.8084 68.7436C42.5903 69.1936 42.2729 69.5891 41.8798 69.9008C41.4463 70.2495 40.9298 70.4818 40.3798 70.5754L44.9598 76.627H42.7598L38.2198 70.6547L36.7598 70.6746ZM39.2998 68.9484C40.1198 68.9484 40.5398 68.7698 40.8398 68.4722C41.1464 68.1663 41.3189 67.7527 41.3198 67.3214C41.3232 67.1072 41.2824 66.8947 41.1998 66.6967C41.1173 66.4988 40.9947 66.3198 40.8398 66.1706C40.5398 65.873 40.1198 65.6944 39.2998 65.6944H36.7398V68.9484H39.2998Z"
+    fill="black" />
+  <path d="M46.4198 63.9682H48.2398V76.6468H46.4198V63.9682Z" fill="black" />
+  <path
+    d="M52.3798 67.3412V76.6468H50.5598V63.9682H51.8398L59.4998 73.2738V63.9682H61.3198V76.6468H60.0398L52.3798 67.3412Z"
+    fill="black" />
+  <path
+    d="M69.3998 63.7897C71.2198 63.7897 72.9598 64.5238 74.0798 65.7539L72.8598 66.9444C72.1198 66.1309 70.7798 65.5158 69.4198 65.5158C66.7998 65.5158 64.7798 67.5793 64.7798 70.3174C64.7798 73.1746 66.8598 75.119 69.5798 75.119C70.2855 75.1113 70.9806 74.9469 71.6139 74.6379C72.2472 74.3289 72.8028 73.8831 73.2398 73.3333L74.5398 74.4841C73.9384 75.2147 73.1823 75.805 72.3251 76.2131C71.4678 76.6211 70.5306 76.837 69.5798 76.8452C65.7598 76.8452 62.9598 74.0674 62.9598 70.3174C62.9398 66.6666 65.7198 63.7897 69.3998 63.7897Z"
+    fill="black" />
+  <path
+    d="M82.1198 68.9484V70.6746H77.9198V74.9206H83.5798V76.6468H76.0998V63.9682H83.3998V65.6944H77.9198V68.9484H82.1198Z"
+    fill="black" />
+  <path d="M84.8798 63.9682H93.6398V65.6944H90.1798V76.6468H88.3598V65.6944H84.8998L84.8798 63.9682Z" fill="black" />
+  <path
+    d="M100.3 63.7897C103.92 63.7897 106.68 66.6071 106.68 70.3174C106.68 74.0079 103.9 76.8452 100.3 76.8452C96.6798 76.8452 93.9198 74.0277 93.9198 70.3174C93.9198 66.627 96.6998 63.7897 100.3 63.7897ZM100.3 75.119C102.92 75.119 104.86 73.0754 104.86 70.3174C104.86 67.5793 102.9 65.5158 100.3 65.5158C97.6998 65.5158 95.7398 67.5793 95.7398 70.3174C95.7398 73.0754 97.6998 75.119 100.3 75.119Z"
+    fill="black" />
+  <path d="M110.08 67.3412V76.6468H108.26V63.9682H109.54L117.2 73.2738V63.9682H119.02V76.6468H117.74L110.08 67.3412Z"
+    fill="black" />
+  <path
+    d="M19.1998 71.7262C18.7997 72.1001 18.2695 72.3063 17.7198 72.3016C16.7198 72.3016 15.3598 71.5277 15.3598 70C15.3589 69.3995 15.5948 68.8225 16.0171 68.3924C16.4395 67.9623 17.0147 67.7132 17.6198 67.6984C18.0386 67.6889 18.4503 67.8066 18.7998 68.0357V67.8174H19.9398V70.3968C19.9224 70.6004 19.9567 70.8051 20.0398 70.992C20.0859 71.0708 20.1536 71.135 20.235 71.1772C20.3165 71.2193 20.4083 71.2377 20.4998 71.2301C21.1398 71.2301 21.2798 70.3373 21.2798 69.7222C21.2798 67.7976 19.6598 66.4484 17.8598 66.4484C16.9295 66.4642 16.0424 66.8405 15.3883 67.4969C14.7341 68.1534 14.365 69.0377 14.3597 69.9607C14.3545 70.8838 14.7136 71.7722 15.3603 72.4358C16.0069 73.0995 16.8897 73.4857 17.8198 73.5119C18.5915 73.5254 19.3454 73.2808 19.9598 72.8174L20.6198 73.7897C19.8299 74.3773 18.8671 74.6911 17.8798 74.6825C16.6278 74.672 15.4303 74.1725 14.5468 73.2923C13.6633 72.4121 13.165 71.222 13.1597 69.9799C13.1545 68.7377 13.6427 67.5435 14.5187 66.656C15.3947 65.7684 16.5879 65.259 17.8398 65.2381C20.2798 65.2381 22.4598 67.123 22.4598 69.6825C22.4598 71.0714 21.8398 72.2619 20.4598 72.2619C20.2232 72.2684 19.988 72.2239 19.7704 72.1314C19.5529 72.0389 19.3582 71.9007 19.1998 71.7262ZM17.7798 71.2103C17.964 71.2166 18.1473 71.1826 18.3167 71.1105C18.4861 71.0385 18.6374 70.9303 18.7598 70.7936C18.7423 70.6355 18.7356 70.4764 18.7398 70.3174V69.127C18.6134 69.0035 18.4633 68.9065 18.2984 68.8417C18.1335 68.7769 17.9571 68.7457 17.7798 68.75C17.4509 68.75 17.1355 68.8796 16.903 69.1103C16.6704 69.341 16.5398 69.6539 16.5398 69.9801C16.5398 70.3064 16.6704 70.6193 16.903 70.85C17.1355 71.0807 17.4509 71.2103 17.7798 71.2103Z"
+    fill="black" />
+</svg>
\ No newline at end of file
diff --git a/static/wagtailadmin/css/custom.css b/static/wagtailadmin/css/custom.css
new file mode 100644
index 000000000..de185a6b3
--- /dev/null
+++ b/static/wagtailadmin/css/custom.css
@@ -0,0 +1,4 @@
+/*  Remove extra unneeded "heading" label (without `for`) */
+[data-contentpath='heading'] > .w-field__label:not([for]) {
+  display: none;
+}
diff --git a/templates/wagtailadmin/base.html b/templates/wagtailadmin/base.html
index b2fbbeaf7..976d894de 100644
--- a/templates/wagtailadmin/base.html
+++ b/templates/wagtailadmin/base.html
@@ -2,6 +2,5 @@
 {% load static %}
 
 {% block branding_logo %}
-<img src="{% static 'img/cdh-logo-assets/CDH_logo_white.svg' %}"
-    alt="CDH Website" width="100"/>
+<img src="{% static 'images/cdh-logo-admin.svg' %}" alt="CDH Website admin" width="140"/>
 {% endblock %} 
\ No newline at end of file