Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Header and Footer Changes #471

Merged
merged 1 commit into from
Aug 27, 2024
+71 −10
Merged

Header and Footer Changes #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
"drush/drush": "^12",
"oomphinc/composer-installers-extender": "^2.0",
"symfony/flex": "^1.17",
"unocha/common_design": "9.2.6",
"unocha/common_design": "^9.4",
"unocha/gtm_barebones": "^1.0",
"unocha/ocha_monitoring": "^1.0",
"unocha/ocha_snap": "^8.3.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion html/themes/custom/gms_ocha_common/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,12 @@ svg.icons-sprite,
display: none
}

.cd-ocha-services {
position: relative;
margin-block-end: 3rem !important;
padding-block-end: 1rem !important;
}

.visually-hidden,
.cd-footer__section--menu h2,
.cd-search--inline__form label,
Expand Down Expand Up @@ -7778,7 +7784,6 @@ display: block;}

.gms-home-page h1 {font-family: 'Roboto', serif; font-size: 30px; font-weight: 300;}
.gms-home-page h1 span {font-weight: 600;}
.gms-home-page h2 {font-family: 'Roboto Slab', serif; font-size: 24px; font-weight: 300; color:#333; border-bottom: 2px solid #c4c4c4; padding-bottom: 10px; margin-bottom: 15px;}

.gms-home-page .top-panel {background-color: #fff;}
.gms-home-page .top-panel p {font-size: 14px; font-weight: 300; line-height: 22px;}
Expand Down
2 changes: 1 addition & 1 deletion html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-footer.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% endblock %}

{% block ocha %}
{% include '@gms_ocha_common/cd/cd-header/cd-ocha.html.twig' %}
{% include '@gms_ocha_common/cd/cd-footer/cd-ocha.html.twig' %}
{% endblock %}

{% endembed %}
56 changes: 56 additions & 0 deletions html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-ocha.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<section id="cd-ocha-services" class="cd-ocha-services cd-footer__section cd-footer__section--ocha-services" aria-label="{{ 'OCHA Services'|t }}">
<h2 id="cd-ocha-services-title">{{ 'OCHA Services'|t }}</h2>

<div class="cd-ocha-services__content">
<div class="cd-ocha-services__inner">
<div class="cd-ocha-services__section">
<p class="cd-ocha-services__heading">{{ 'Related Platforms'|t }}</p>
<ul class="cd-ocha-services__list">
{% block related_platforms %}
<li class="cd-ocha-services__link"><a href="https://cbpf.unocha.org" target="_blank">{{ 'CBPF Grant Management system'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://pfdata.unocha.org" target="_blank">{{ 'Pooled Fund Data Hub'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://cerf.data.unocha.org/" target="_blank">{{ 'CERF Data Hub'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://cbpf.data.unocha.org" target="_blank">{{ 'CBPF Data Hub'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://gms.unocha.org/content/home" target="_blank">{{ 'GMS Help portal'|t }}</a></li>
{% endblock %}
</ul>
</div>
<div class="cd-ocha-services__section">
<p class="cd-ocha-services__heading">{{ 'Other OCHA Services'|t }}</p>
<ul class="cd-ocha-services__list">
{% block other_services_first %}
<li class="cd-ocha-services__link"><a href="https://fts.unocha.org/" target="_blank">{{ 'Financial Tracking Service'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://data.humdata.org/" target="_blank">{{ 'Humanitarian Data Exchange'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://auth.humanitarian.id/" target="_blank">{{ 'Humanitarian ID'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://humanitarianresponse.info/" target="_blank">{{ 'Humanitarian Response'|t }}</a></li>
{% endblock %}
</ul>
</div>
<div class="cd-ocha-services__section">
<p class="cd-ocha-services__heading" aria-hidden="true">&nbsp;</p>
<ul class="cd-ocha-services__list">
{% block other_services_second %}
<li class="cd-ocha-services__link"><a href="https://interagencystandingcommittee.org" target="_blank">{{ 'Inter-Agency Standing Committee'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://unocha.org/" target="_blank">{{ 'OCHA website'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://reliefweb.int/" target="_blank">{{ 'ReliefWeb'|t }}</a></li>
<li class="cd-ocha-services__link"><a href="https://vosocc.unocha.org/" target="_blank">{{ 'Virtual OSOCC'|t }}</a></li>
{% endblock %}
</ul>
</div>
<div class="cd-ocha-services__section">
<p class="cd-ocha-services__heading" aria-hidden="true">&nbsp;</p>
<ul class="cd-ocha-services__list">
<li class="cd-ocha-services__link">
<a class="cd-ocha-services__see-all" href="https://www.unocha.org/ocha-digital-services" target="_blank" rel="noopener">
{{ 'More OCHA Services'|t }}
<span class="visually-hidden">Opens in a new window</span>
<svg class="cd-icon cd-icon--external-link" width="16" height="16" aria-hidden="true" focusable="false">
<use xlink:href="#cd-icon--external-link"></use>
</svg>
</a>
</li>
</ul>
</div>
</div>
</div>
</section>