Skip to content

Commit

Permalink
Merge pull request #791 from IATI/2024-11-08-website-work
Browse files Browse the repository at this point in the history
2024 11 08 website work
  • Loading branch information
James (ODSC) authored Nov 13, 2024
2 parents c7f4108 + 2b97e15 commit 0aec3cc
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 17 deletions.
4 changes: 2 additions & 2 deletions home/templates/home/home_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
{% endblock %}

{% block content %}
{% include 'home/modules/statistics.html' %}
{% include 'home/modules/getting-started.html' %}
{% include 'home/modules/about-iati.html' %}
{% include 'home/modules/statistics.html' %}
{% include 'home/modules/iati-in-action.html' %}
{% include 'home/modules/about-iati.html' %}
{% include 'home/modules/iati-tools.html' %}
{% include 'home/modules/flexible-features.html' %}
{% include 'home/modules/news-tweets.html' with notalt=page.flexible_features|length|divisibleby:2 %}
Expand Down
4 changes: 2 additions & 2 deletions home/templates/home/modules/about-iati.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load iati_tags %}

<div class="row">
<div class="section-alt-top section-alt-bottom">
<div class="section">
<div class="row">
<h2 class="section__heading">{{ page.about_iati_title }}</h2>
{% if page.about_iati_video %}
<div class="l-2up">
Expand Down
2 changes: 1 addition & 1 deletion home/templates/home/modules/flexible-features.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load wagtailcore_tags responsive %}

{% for child in page.flexible_features %}
<div class="{% cycle 'section' 'section-alt' %}">
<div class="{% cycle 'section' 'section-alt section-alt-top' %}">
<div class="row">
<h2 class="section__heading">{{ child.value.title }}</h2>
{% if child.value.image %}
Expand Down
2 changes: 1 addition & 1 deletion home/templates/home/modules/getting-started.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load responsive %}

<div class="section">
<div class="section-alt">
<div class="row">
<h2 class="section__heading">{{ page.getting_started_title }}</h2>
<div class="l-3up">
Expand Down
2 changes: 1 addition & 1 deletion home/templates/home/modules/iati-in-action.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load responsive %}

<div class="section section-alt-bottom">
<div class="section-alt section-alt-top section-alt-bottom">
<div class="row">
<h2 class="section__heading">{{ page.iati_in_action_title }}</h2>
{% if page.iati_in_action_description %}
Expand Down
4 changes: 2 additions & 2 deletions home/templates/home/modules/iati-tools.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load responsive i18n tool_utils %}

<div class="row">
<div class="section-alt">
<div class="section-alt section-alt-top">
<div class="row">
<h2 class="section__heading">{{ page.iati_tools_title }}</h2>
{% if page.iati_tools_description %}
<div class="max-meter is-typeset is-typeset--article">
Expand Down
7 changes: 0 additions & 7 deletions home/templates/home/modules/news-tweets.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<div {% if not notalt %}class="section-alt-top section-alt-bottom"{% else %}class="section"{% endif %}>
<div class="row">
<h2 class="section__heading">{{ page.latest_news_title }}</h2>
<div class="l-2up">
<div class="l-2up__col">
{% for item in page.news %}
<article class="listing listing--article listing--article--minor">
<aside class="listing__aside">
Expand All @@ -31,11 +29,6 @@ <h3 class="listing__heading">{{ item.heading }}</h3>
</article>
{% endfor %}
<a href="{{ page.news_index.url }}" class="button">{{ page.latest_news_link_label }}</a>
</div>
<div class="l-2up__col">
<a class="twitter-timeline" data-height="800" href="https://twitter.com/{{ global.twitter_handle }}?ref_src=twsrc%5Etfw">{{ page.latest_news_tweets_title }} {% trans "by" %} {{ global.twitter_handle }}</a>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
</div>
</div>
</div>
</div>
2 changes: 2 additions & 0 deletions home/templates/home/modules/statistics.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% load static responsive iati_tags %}

<div class="section">
<div class="row">
<div class="stats stats--standout">
{% if page.testimonial %}
Expand Down Expand Up @@ -30,3 +31,4 @@ <h2 class="stat__heading stat__heading--large" id="stat-publishers" data-inc-dur
</div>
</div>
</div>
</div>
1 change: 0 additions & 1 deletion patterns/assets/css/modules/_stats.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}

.stat {
background-color: #fff;
box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.1);
.stats--grid & {
border-left: 3px solid $iati-ocean;
Expand Down

0 comments on commit 0aec3cc

Please sign in to comment.