Merge branch 'proof-of-concept' of github.com:nationalarchives/ds-etn…

…a-frontend into proof-of-concept
nationalarchives · Jan 8, 2024 · 54bb313 · 54bb313
2 parents 8f3559e + e96160f
commit 54bb313
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/templates/macros/article-blocks.html b/app/templates/macros/article-blocks.html
@@ -179,6 +179,7 @@ <h3 class="tna-heading-s">
         'imageWidth': article['teaser_image_jpg']['width'],
         'imageHeight': article['teaser_image_jpg']['height'],
         'plainSupertitle': True,
+        'style': 'contrast',
         'htmlElement': 'article',
         'horizontal': True
       }) }}

diff --git a/app/templates/search/website.html b/app/templates/search/website.html
@@ -84,11 +84,11 @@ <h2 class="tna-heading-xl tna-!--hide-on-large tna-!--hide-on-medium tna-!--marg
   {% else %}
   <div class="tna-column tna-column--width-3-4 tna-column--width-2-3-medium tna-column--full-small tna-column--full-tiny tna-!--padding-top-l" id="search-results">
     <h2 class="tna-heading-xl tna-!--hide-on-large tna-!--hide-on-medium tna-!--margin-bottom-m">Search results</h2>
-    <hr class="tna-!--margin-bottom-s">
+    <hr>
     <!-- TODO: Make into ul -->
     {% for result in results.results %}
     <article class="tna-container tna-container--no-padding">
-      <div class="tna-column tna-column--width-7-12 tna-column--width-1-2-medium tna-column--width-2-3-small tna-column--full-tiny">
+      <div class="tna-column tna-column--width-7-12 tna-column--width-1-2-medium tna-column--width-2-3-small tna-column--full-tiny tna-!--margin-top-m">
         <hgroup class="tna-hgroup-m">
           <p class="tna-hgroup__supertitle tna-hgroup__supertitle--plain-">{{ result.type | article_type }}</p>
           <h1 class="tna-hgroup__title">
@@ -97,11 +97,11 @@ <h1 class="tna-hgroup__title">
         </hgroup>
         <p>{{ result.description }}</p>
       </div>
-      <div class="tna-column tna-column--width-5-12 tna-column--width-1-2-medium tna-column--width-1-3-small tna-column--full-tiny">
+      <div class="tna-column tna-column--width-5-12 tna-column--width-1-2-medium tna-column--width-1-3-small tna-column--full-tiny tna-!--margin-top-m">
         <img src="{{ result.image.full_url }}" width="{{ result.image.width }}" height="{{ result.image.height }}" alt="{{ result.image.alt }}">
       </div>
     </article>
-    <hr class="tna-!--margin-vertical-s">
+    <hr class="tna-!--margin-top-m">
     {% endfor %}
   </div>
   {% endif %}