Skip to content

Commit

Permalink
Merge branch 'develop' into feature/36-community-event
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pete-Robelou
Pete-Robelou committed Feb 15, 2021
2 parents 7952ba4 + 3a7cecc commit 83ef653
Show file tree
Hide file tree
Showing 16 changed files with 578 additions and 155 deletions.
22 changes: 20 additions & 2 deletions src/_includes/components/social-shares.njk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<a href="https://twitter.com/share?url={{site.url}}{{page.url}}&text={{title}}&via={{site.social.twitter}}" target="_blank" rel="noreferrer noopener">Twitter</a>
<a href="https://www.facebook.com/sharer.php?u={{site.url}}{{page.url}}" target="_blank" rel="noreferrer noopener">Facebook</a>
<div class="social-shares">
<a class="social-shares__twitter" href="https://twitter.com/share?url={{site.url}}{{page.url}}&text={{title}}&via={{site.social.twitter}}" rel="noreferrer noopener" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" aria-hidden="true" focusable="false">
<g fill="transparent" fill-rule="evenodd" stroke-width="2">
<circle cx="23.925" cy="23.925" r="21.75" stroke="#eb1414" stroke-linecap="square"/>
<path fill="#fff" stroke="#0a0c38" stroke-linejoin="round" d="M36 16.575c-.9.375-1.837.675-2.813.788a4.958 4.958 0 002.175-2.738 9.771 9.771 0 01-3.112 1.2c-.938-.975-2.212-1.575-3.637-1.575a4.905 4.905 0 00-4.913 4.913c0 .375.038.75.113 1.125-4.088-.188-7.726-2.175-10.125-5.138a4.986 4.986 0 00-.676 2.475c0 1.725.863 3.225 2.175 4.087a5.231 5.231 0 01-2.212-.6v.076c0 2.4 1.688 4.387 3.938 4.837a5.043 5.043 0 01-1.313.188c-.3 0-.637-.038-.938-.076a4.935 4.935 0 004.613 3.413 9.962 9.962 0 01-6.112 2.1c-.413 0-.788-.037-1.163-.075 2.175 1.35 4.762 2.175 7.538 2.175 9.075 0 14.024-7.5 14.024-14.025v-.638A10.355 10.355 0 0036 16.575z"/>
</g>
</svg>
<span class="visually-hidden">Twitter</span>
</a>
<a class="social-shares__facebook" href="https://www.facebook.com/sharer.php?u={{site.url}}{{page.url}}" rel="noreferrer noopener" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" aria-hidden="true" focusable="false">
<g fill="transparent" fill-rule="evenodd" stroke-width="2">
<circle cx="23.925" cy="23.925" r="21.75" stroke="#eb1414" stroke-linecap="square"/>
<path fill="#fff" stroke="#0a0c38" stroke-linejoin="round" d="M21.043 36.75V25.7H17.25v-5.1h3.793v-3.562c0-3.88 2.456-5.788 5.917-5.788 1.658 0 3.082.123 3.498.179v4.054l-2.4.001c-1.883 0-2.308.894-2.308 2.207V20.6h5.1l-1.7 5.1h-3.4v11.05h-4.707z"/>
</g>
</svg>
<span class="visually-hidden">Facebook</span>
</a>
</div>

84 changes: 60 additions & 24 deletions src/_includes/layouts/blog-post.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,69 @@
layout: base
---

{% set blogPostLocaleTag = locale + '-blog-post' %}
{% set articleLocaleTag = locale + '-article' %}

{% include 'components/navigation-secondary.njk' %}

<div class="grid grid--cols-auto-72">
<div>
<h1 class="h1">{{ title }}</h1>
<time class="block mb-2" datetime="{{ page.date }}">{{ page.date | formatDate(locale) }}</time>
{% if image %}
<img class="mb-2" src="{{ image }}" alt=""/>
{% endif %}
<div class="intro-para">
{{ content | safe }}
<section class="section">
<div class="grid lg:grid--cols-auto-72">
<div>
<h1 class="h1">{{ title }}</h1>
<div class="flex flex--gap-8 flex--pipe mb-7 lg:mb-9 xl:mb-10">
<time class="mb-0 p-sm" datetime="{{ page.date }}">{{ page.date | formatDate(locale) }}</time>
<span class="mb-0 p-sm text-semibold">{{ author }}</span>
</div>
</div>
</div>
<aside>
<h2 class="h4">{{ 'share_this_article' | i18n }}</h2>
{% include "components/social-shares.njk" %}

{% set blogPostLocaleTag = locale + '-blog-post' %}
{% set articleLocaleTag = locale + '-article' %}
<div class="grid lg:grid--cols-auto-72 to-lg:grid--gap-0 lg:grid--gap-16 xl:grid--gap-20">
<div>
{% if image %}
<div class="to-lg:w-full-breakout">
<div class="aspect-ratio aspect-ratio--16x9 aspect-ratio--contain bg-grey-500 mb-8 lg:mb-10 xl:mb-12">
<img alt="" class="absolute h-full top-0" loading="lazy" src="{{ image }}" />
</div>
</div>
{% endif %}
<div class="intro-para richtext">
{{ content | safe }}
</div>
</div>
<aside>
<hr class="hr lg:hidden my-16">
<div class="grid md-to-lg:grid--cols-2 to-md:grid--gap-14 lg:grid--gap-0">
<div>
<h2 class="h5">{{ 'share_this_article' | i18n }}</h2>
{% include "components/social-shares.njk" %}
<hr class="hidden lg:block hr">
</div>
<div>
<h2 id="tags-desc" class="h5">{{ 'read_more_articles_like_this' | i18n }}</h2>
<ul class="list-none p-0" aria-describedby="tags-desc">
{% for item in tags | removeTagsFromArray([blogPostLocaleTag, articleLocaleTag]) %}
<li {% if loop.revindex0 %}class="mb-3"{% endif %}>
<a class="button button--pill" href="/{{ locale }}/news/blog/category/{{ item | slug }}/">{{ item }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</aside>
</div>
</section>

<h2 id="tags-desc" class="h4">{{ 'read_more_articles_like_this' | i18n }}</h2>
<ul class="ul" aria-describedby="tags-desc">
{% for item in tags | removeTagsFromArray([blogPostLocaleTag, articleLocaleTag]) %}
<li>
<a href="/{{ locale }}/news/blog/tag/{{ item | slug }}/">#{{ item }}</a>
</li>
{% endfor %}
</ul>
</aside>
</div>
<section class="pt-0 section">
<div class="bg-grey-300 border-grey-500 border-px border-solid p-5 rounded-2">
<div class="flex flex--align-center flex--gap-6 flex--justify-between flex--wrap">
<div>
<h2 class="h3">Subscribe to Ceph Announcements</h2>
<p class="p">Ned placerat est a augue pulvinar imperdiet quis in setiam euismod.</p>
<a class="a" href="#">Other ways to stay connected</a>
</div>
<div>
<a class="button" href="#">Subscribe to Ceph Announcements</a>
</div>
</div>
</div>
</section>
4 changes: 2 additions & 2 deletions src/_includes/layouts/case-study.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ layout: base
<div>
{% if image %}
<div class="to-lg:w-full-breakout">
<div class="aspect-ratio aspect-ratio--16x9 mb-8 lg:mb-10 xl:mb-12">
<img alt="" class="absolute top-0" loading="lazy" src="{{ image }}" />
<div class="aspect-ratio aspect-ratio--16x9 aspect-ratio--contain bg-grey-500 mb-8 lg:mb-10 xl:mb-12">
<img alt="" class="absolute h-full top-0" loading="lazy" src="{{ image }}" />
</div>
</div>
{% endif %}
Expand Down
84 changes: 60 additions & 24 deletions src/_includes/layouts/press-release.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,69 @@
layout: base
---

{% set pressReleaseLocaleTag = locale + '-press-release' %}
{% set articleLocaleTag = locale + '-article' %}

{% include 'components/navigation-secondary.njk' %}

<div class="grid grid--cols-auto-72">
<div>
<h1 class="h1">{{ title }}</h1>
<time class="block mb-2" datetime="{{ page.date }}">{{ page.date | formatDate(locale) }}</time>
{% if image %}
<img class="mb-2" src="{{ image }}" alt=""/>
{% endif %}
<div class="intro-para">
{{ content | safe }}
<section class="section">
<div class="grid lg:grid--cols-auto-72">
<div>
<h1 class="h1">{{ title }}</h1>
<div class="flex flex--gap-8 flex--pipe mb-7 lg:mb-9 xl:mb-10">
<time class="mb-0 p-sm" datetime="{{ page.date }}">{{ page.date | formatDate(locale) }}</time>
<span class="mb-0 p-sm text-semibold">{{ author }}</span>
</div>
</div>
</div>
<aside>
<h2 class="h4">{{ 'share_this_article' | i18n }}</h2>
{% include "components/social-shares.njk" %}

{% set pressReleaseLocaleTag = locale + '-press-release' %}
{% set articleLocaleTag = locale + '-article' %}
<div class="grid lg:grid--cols-auto-72 to-lg:grid--gap-0 lg:grid--gap-16 xl:grid--gap-20">
<div>
{% if image %}
<div class="to-lg:w-full-breakout">
<div class="aspect-ratio aspect-ratio--16x9 aspect-ratio--contain bg-grey-500 mb-8 lg:mb-10 xl:mb-12">
<img alt="" class="absolute h-full top-0" loading="lazy" src="{{ image }}" />
</div>
</div>
{% endif %}
<div class="intro-para richtext">
{{ content | safe }}
</div>
</div>
<aside>
<hr class="hr lg:hidden my-16">
<div class="grid md-to-lg:grid--cols-2 to-md:grid--gap-14 lg:grid--gap-0">
<div>
<h2 class="h5">{{ 'share_this_article' | i18n }}</h2>
{% include "components/social-shares.njk" %}
<hr class="hidden lg:block hr">
</div>
<div>
<h2 id="tags-desc" class="h5">{{ 'read_more_articles_like_this' | i18n }}</h2>
<ul class="list-none p-0" aria-describedby="tags-desc">
{% for item in tags | removeTagsFromArray([pressReleaseLocaleTag, articleLocaleTag]) %}
<li {% if loop.revindex0 %}class="mb-3"{% endif %}>
<a class="button button--pill" href="/{{ locale }}/news/blog/category/{{ item | slug }}/">{{ item }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</aside>
</div>
</section>

<h2 id="tags-desc" class="h4">{{ 'read_more_articles_like_this' | i18n }}</h2>
<ul class="ul" aria-describedby="tags-desc">
{% for item in tags | removeTagsFromArray([pressReleaseLocaleTag, articleLocaleTag]) %}
<li>
<a href="/{{ locale }}/news/blog/tag/{{ item | slug }}/">#{{ item }}</a>
</li>
{% endfor %}
</ul>
</aside>
</div>
<section class="pt-0 section">
<div class="bg-grey-300 border-grey-500 border-px border-solid p-5 rounded-2">
<div class="flex flex--align-center flex--gap-6 flex--justify-between flex--wrap">
<div>
<h2 class="h3">Subscribe to Ceph Announcements</h2>
<p class="p">Ned placerat est a augue pulvinar imperdiet quis in setiam euismod.</p>
<a class="a" href="#">Other ways to stay connected</a>
</div>
<div>
<a class="button" href="#">Subscribe to Ceph Announcements</a>
</div>
</div>
</div>
</section>
7 changes: 7 additions & 0 deletions src/assets/svgs/logo-facebook-blue-red.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/svgs/logo-twitter-blue-red.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 83ef653

Please sign in to comment.