Merge pull request #282 from UN-OCHA/RWR-142-rss

[RWR-142] More tweaks to external feeds
UN-OCHA · Jul 27, 2022 · b0086c9 · b0086c9
2 parents f18da8e + b812a72
commit b0086c9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -119,6 +119,7 @@ hri-river:
     theme:
       components/hri-river/hri-river.css: {}
   dependencies:
+    - common_design_subtheme/rw-brand
     - common_design/cd-button
     - common_design_subtheme/hri-powered-by
 

diff --git a/...themes/custom/common_design_subtheme/components/hri-global-styling/hri-global-styling.css b/...themes/custom/common_design_subtheme/components/hri-global-styling/hri-global-styling.css
@@ -24,3 +24,15 @@
 .node--unpublished {
   background: #fdd;
 }
+
+/**
+ * External URLs
+ */
+.hri__external-url {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: transparent url("../rw-brand/rw-icons-sprite.svg") -84px -108px no-repeat;
+}
diff --git a/html/themes/custom/common_design_subtheme/components/hri-river/hri-river.css b/html/themes/custom/common_design_subtheme/components/hri-river/hri-river.css
@@ -147,7 +147,7 @@
   margin: -2px 6px 0 0;
   content: "";
   vertical-align: middle;
-  background: rgba(0, 0, 0, 0) url("rw-icons-sprite.svg") -328px -32px no-repeat;
+  background: rgba(0, 0, 0, 0) url("../rw-brand/rw-icons-sprite.svg") -328px -32px no-repeat;
 }
 
 .hri-river__result .meta dd.format.map::before {
@@ -173,7 +173,7 @@
   display: inline-block;
   width: 12px;
   height: 12px;
-  background: transparent url("rw-icons-sprite.svg") -72px -60px no-repeat;
+  background: transparent url("../rw-brand/rw-icons-sprite.svg") -108px -60px no-repeat;
 }
 
 /* external URL symbols */
@@ -183,7 +183,7 @@
   display: inline-block;
   width: 12px;
   height: 12px;
-  background: transparent url("rw-icons-sprite.svg") -84px -108px no-repeat;
+  background: transparent url("../rw-brand/rw-icons-sprite.svg") -84px -108px no-repeat;
 }
 
 /**

diff --git a/.../components/hri-river/rw-icons-sprite.svg → ...e/components/rw-brand/rw-icons-sprite.svg b/.../components/hri-river/rw-icons-sprite.svg → ...e/components/rw-brand/rw-icons-sprite.svg
diff --git a/html/themes/custom/common_design_subtheme/templates/hr-paragraphs-rss-feed.html.twig b/html/themes/custom/common_design_subtheme/templates/hr-paragraphs-rss-feed.html.twig
@@ -10,6 +10,7 @@
         <h3>
           {% if options.display_date %}{{ item.date|date('d-M-Y') }} - {% endif %}
           <a rel="noopener noreferrer external nofollow" class="external-feed--item-link" href="{{ item.link }}">{{ item.title }}</a>
+          <span class="hri__external-url"></span>
         </h3>
       </div>
 

diff --git a/html/themes/custom/common_design_subtheme/templates/river-row.html.twig b/html/themes/custom/common_design_subtheme/templates/river-row.html.twig
@@ -17,7 +17,7 @@
     </p>
     <h3 class="title">
       <a href="{{ row.url }}">{{ row.title }}</a>
-      <span class="hri-river__external-url"></span>
+      <span class="hri__external-url"></span>
     </h3>
   </header>
 
@@ -58,9 +58,9 @@
       <dt class="files">{{ 'Files'|t }}:</dt>
       <dd class="files">
         {% for file in row.files|slice(0,1) %}
-          <a class="hri-river__file" href="{{ file.url }}" title="{{ file.name }}">
+          <a class="hri-river__file cd-button cd-button--small cd-button--icon" href="{{ file.url }}" title="{{ file.name }}">
             <span class="visually-hidden">{{ 'Download'|t }}</span>
-            <span class="hri-river__file-icon"></span>
+            <span class="cd-button__icon hri-river__file-icon"></span>
           </a>
         {% endfor %}
         {% if row.files|length > 1 %}