diff --git a/CHANGELOG.md b/CHANGELOG.md index d0fb536438180b9fc478415da4bbeaf5bac68fa4..3ebf7f3458353b2e9d472f15dba535ecba3e9ec8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Fixed + +- Resolved display issues of the resource view and share icons. + ## [2.4.1] - 2024-05-16 ### Added diff --git a/ckanext/odsh/assets/odsh.css b/ckanext/odsh/assets/odsh.css index bc7d43cb1d7b6363fcae48fd9e033bcab1260922..e45d7815c1ee41ef3e6f3b40212bf07221fc2e07 100644 --- a/ckanext/odsh/assets/odsh.css +++ b/ckanext/odsh/assets/odsh.css @@ -127,6 +127,16 @@ h3 { top: 0; } +.secondary-2 .nav-simple > li { + padding: 7px 25px; + display: block; + width: auto; +} + +.secondary-2 .social ul li { + float: left; +} + .secondary h1.heading { color: black; font-weight: normal; @@ -366,6 +376,11 @@ section#dataset-collection .button-container img { display: inline-block; } +.module-resource { + z-index: 1; + display: table-caption; +} + .module-content:first-child { padding-top: 0px; } diff --git a/ckanext/odsh/templates/package/resource_read.html b/ckanext/odsh/templates/package/resource_read.html index 491aa400608f3e7ad24ac5e9136b097023eca8fe..099ac44ac0d4e13292689f67e3cfab3e08de33bf 100644 --- a/ckanext/odsh/templates/package/resource_read.html +++ b/ckanext/odsh/templates/package/resource_read.html @@ -175,13 +175,14 @@ {% endblock %} {% block secondary_content %} + <div class="secondary-2"> + {% block resources_list %} + {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id %} + {% endblock %} - {% block resources_list %} - {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id %} - {% endblock %} - - {% block resource_license %} - {% snippet "snippets/social.html" %} - {% endblock %} + {% block resource_license %} + {% snippet "snippets/social.html" %} + {% endblock %} + </div> {% endblock %} diff --git a/ckanext/odsh/templates/snippets/social.html b/ckanext/odsh/templates/snippets/social.html index f0e922f55d8efa47b5793329cc07335db1fb7cc9..3552b3805a58620d67428fa98708b2722766e1e3 100644 --- a/ckanext/odsh/templates/snippets/social.html +++ b/ckanext/odsh/templates/snippets/social.html @@ -5,8 +5,8 @@ {% endblock %} {% block social_nav %} <ul class="nav nav-simple"> - <li class="nav-item"><a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank"><i class="fa fa-facebook-square"></i></a></li> - <li class="nav-item"><a href="https://twitter.com/share?url={{ current_url }}" target="_blank"><i class="fa fa-twitter-square"></i></a></li> + <li class="nav-item"><a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank"><i class="fa-brands fa-facebook-square"></i></a></li> + <li class="nav-item"><a href="https://twitter.com/share?url={{ current_url }}" target="_blank"><i class="fa-brands fa-twitter-square"></i></a></li> </ul> {% endblock %} </section>