From f11d522390bd28857317901ddfc491cdfd94ce79 Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Thu, 30 May 2024 07:21:25 -0700
Subject: [PATCH 1/6] add hash to heading to improve plain text / cut & paste
 clarity

---
 dev/stats.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/stats.sh b/dev/stats.sh
index 34f97538..543ed680 100755
--- a/dev/stats.sh
+++ b/dev/stats.sh
@@ -55,7 +55,7 @@ error_exit() {
 
 header() {
     # Print 80 character wide black on white heading with time
-    printf "${E30}${E107} %-71s$(date '+%T') ${E0}\n" "${@}"
+    printf "${E30}${E107}# %-70s$(date '+%T') ${E0}\n" "${@}"
 }
 
 

From ca7786176b49d6148169c6121bfd4db102a4c876 Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Thu, 30 May 2024 07:21:56 -0700
Subject: [PATCH 2/6] improve consistency of whitespace between deed and legal
 code

---
 cc_legal_tools/static/cc-legal-tools/deed.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cc_legal_tools/static/cc-legal-tools/deed.css b/cc_legal_tools/static/cc-legal-tools/deed.css
index c3baa6aa..516504f0 100644
--- a/cc_legal_tools/static/cc-legal-tools/deed.css
+++ b/cc_legal_tools/static/cc-legal-tools/deed.css
@@ -3,6 +3,7 @@
   border-bottom: 5px solid var(--vocabulary-neutral-color-dark-gray);
   border-left: 5px solid var(--vocabulary-neutral-color-dark-gray);
   border-right: 5px solid var(--vocabulary-neutral-color-dark-gray);
+  margin-top: 2em;
   margin-left: -3em;
   margin-right: -3em;
   padding-left: 3em;

From 7c349682e4cbe7a38bf827fe70aa52bd1affe8e1 Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Thu, 30 May 2024 07:22:35 -0700
Subject: [PATCH 3/6] rearrange title to improve clarity (formatting pending)

---
 templates/includes/snippet/title_with_icons.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/includes/snippet/title_with_icons.html b/templates/includes/snippet/title_with_icons.html
index e3c271a7..f59f07c9 100644
--- a/templates/includes/snippet/title_with_icons.html
+++ b/templates/includes/snippet/title_with_icons.html
@@ -7,13 +7,14 @@
     </svg>
   </span>
   {% endfor %}
+  {{ tool.identifier }}
 </span>
-<h1>
+<h1>{{ tool_title }}</h2>
+<h2>
   {% if document_type == "deed" %}
-    {{ tool.identifier }} {% trans "Deed" %}
+    {% trans "Deed" %}
   {% else %}
-    {{ tool.identifier }} {% trans "Legal Code" %}
+     {% trans "Legal Code" %}
   {% endif %}
-</h1>
-<h2>{{ tool_title }}</h2>
+</h2>
 {# vim: ft=jinja.html ts=2 sw=2 sts=2 sr et #}

From a82c0ee3d95c92bd9c8724c6f86346fef13438aa Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Thu, 30 May 2024 08:14:02 -0700
Subject: [PATCH 4/6] move identifier to own span

---
 templates/includes/snippet/title_with_icons.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/includes/snippet/title_with_icons.html b/templates/includes/snippet/title_with_icons.html
index f59f07c9..36f68c63 100644
--- a/templates/includes/snippet/title_with_icons.html
+++ b/templates/includes/snippet/title_with_icons.html
@@ -7,8 +7,8 @@
     </svg>
   </span>
   {% endfor %}
-  {{ tool.identifier }}
 </span>
+<span class="tool-identifier">{{ tool.identifier }}</span>
 <h1>{{ tool_title }}</h2>
 <h2>
   {% if document_type == "deed" %}

From 62a416cfbf4b3a036096803b388ca75d419000de Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Thu, 30 May 2024 08:14:29 -0700
Subject: [PATCH 5/6] format pre-title

---
 cc_legal_tools/static/cc-legal-tools/base.css | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/cc_legal_tools/static/cc-legal-tools/base.css b/cc_legal_tools/static/cc-legal-tools/base.css
index b70e00d8..6bf9609d 100644
--- a/cc_legal_tools/static/cc-legal-tools/base.css
+++ b/cc_legal_tools/static/cc-legal-tools/base.css
@@ -54,12 +54,27 @@ div.masthead > nav.ancilliary-menu span.locale.icon-attach:before {
 /* header title */
 /* TODO: resolve with vocabulary-theme */
 .cc-legal-tools main > header {
+  align-items: center;  /* deed display: flex */
   padding: 3em 0;
 }
+.cc-legal-tools,.bidi-left main > header > span.tool-icons {
+  padding-right: 1em;
+  height: 2em;
+}
+.cc-legal-tools,.bidi-right main > header > span.tool-icons {
+  padding-left: 1em;
+}
 .cc-legal-tools main > header > span.tool-icons > span.cc-icon > svg {
   display: inline;
-  height: 4em;
-  width: 4em;
+  height: 2em;
+  width: 2em;
+  vertical-align: text-bottom;  /* legalcode display: block */
+}
+.cc-legal-tools main > header > span.tool-identifier {
+  font-family: 'Roboto Condensed';
+  font-style: normal;
+  font-weight: 700;
+  font-size: 2.1em;
 }
 .cc-legal-tools main > header > h1 {
   margin: 0.2em 0;

From 4264f2f33dde23c94c09cb2611fb0150c551588c Mon Sep 17 00:00:00 2001
From: Timid Robot Zehta <timid@creativecommons.org>
Date: Thu, 30 May 2024 09:08:09 -0700
Subject: [PATCH 6/6] use proper symantic order with specified display order

---
 cc_legal_tools/static/cc-legal-tools/base.css | 22 ++++++++++++-------
 .../includes/snippet/title_with_icons.html    | 20 +++++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/cc_legal_tools/static/cc-legal-tools/base.css b/cc_legal_tools/static/cc-legal-tools/base.css
index 6bf9609d..0edf1a10 100644
--- a/cc_legal_tools/static/cc-legal-tools/base.css
+++ b/cc_legal_tools/static/cc-legal-tools/base.css
@@ -54,33 +54,39 @@ div.masthead > nav.ancilliary-menu span.locale.icon-attach:before {
 /* header title */
 /* TODO: resolve with vocabulary-theme */
 .cc-legal-tools main > header {
-  align-items: center;  /* deed display: flex */
+  align-items: center;
+  /* (upstream vocabulary default-page class uses display: box) */
+  display: flex;
   padding: 3em 0;
 }
-.cc-legal-tools,.bidi-left main > header > span.tool-icons {
+.cc-legal-tools,.bidi-left main > header > span.alt-titles {
+  order: 1;
+}
+.cc-legal-tools,.bidi-left main > header > span.alt-titles > span.tool-icons {
   padding-right: 1em;
-  height: 2em;
 }
-.cc-legal-tools,.bidi-right main > header > span.tool-icons {
+.cc-legal-tools,.bidi-right main > header > span.alt-titles > span.tool-icons {
   padding-left: 1em;
 }
-.cc-legal-tools main > header > span.tool-icons > span.cc-icon > svg {
+main > header > span.alt-titles > span.tool-icons > span.cc-icon > svg {
   display: inline;
   height: 2em;
   width: 2em;
-  vertical-align: text-bottom;  /* legalcode display: block */
+  vertical-align: text-bottom;
 }
-.cc-legal-tools main > header > span.tool-identifier {
+.cc-legal-tools main > header > span.alt-titles > span.tool-identifier {
   font-family: 'Roboto Condensed';
+  font-size: 2.1em;
   font-style: normal;
   font-weight: 700;
-  font-size: 2.1em;
 }
 .cc-legal-tools main > header > h1 {
   margin: 0.2em 0;
+  order: 2;
 }
 .cc-legal-tools main > header > h2 {
   margin: 0;
+  order: 3;
 }
 
 
diff --git a/templates/includes/snippet/title_with_icons.html b/templates/includes/snippet/title_with_icons.html
index 36f68c63..804fa586 100644
--- a/templates/includes/snippet/title_with_icons.html
+++ b/templates/includes/snippet/title_with_icons.html
@@ -1,15 +1,17 @@
 {% load i18n %}
-<span class="tool-icons">
-  {% for code in tool.logos %}
-  <span class="cc-icon">
-    <svg viewBox="0 0 30 30">
-      <use href="/wp-content/themes/vocabulary-theme/vocabulary/svg/cc/icons/cc-icons.svg#{{ code }}"></use>
-    </svg>
+<h1>{{ tool_title }}</h1>
+<span class="alt-titles">
+  <span class="tool-icons">
+    {% for code in tool.logos %}
+    <span class="cc-icon">
+      <svg viewBox="0 0 30 30">
+        <use href="/wp-content/themes/vocabulary-theme/vocabulary/svg/cc/icons/cc-icons.svg#{{ code }}"></use>
+      </svg>
+    </span>
+    {% endfor %}
   </span>
-  {% endfor %}
+  <span class="tool-identifier">{{ tool.identifier }}</span>
 </span>
-<span class="tool-identifier">{{ tool.identifier }}</span>
-<h1>{{ tool_title }}</h2>
 <h2>
   {% if document_type == "deed" %}
     {% trans "Deed" %}