-
Notifications
You must be signed in to change notification settings - Fork 37
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.
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
GH-84 - Modernize CSS #87
Changes from 21 commits
652f023
58f9665
92495e6
32a6f88
5d85a07
0d9feaa
5639001
5713ff8
0dfea27
70d6e21
1ce242c
2195b6e
acfa23f
0d6f2da
d4b274f
2225dc4
55a923d
4bbaeda
94707fa
aff9690
94c8d76
ad12664
c4d1965
1f53d10
81ffe73
b63856d
5c32a16
88453c0
c89ff0a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
{% extends "layouts/base.njk" %} | ||
|
||
{% set bodyClass = "idg-category-" + category %} | ||
|
||
{% set editLinkPath %} | ||
{{ page.filePathStem}}.md | ||
{% endset %} | ||
|
||
{% set navPages = collections[category + "_" + locale] | eleventyNavigationBreadcrumb(eleventyNavigation.key) %} | ||
|
||
{% block content %} | ||
|
||
<header class="article-header {{ category | lower }}-bg fl-inverted-color"> | ||
<div class="wrapper"> | ||
<nav aria-label="{{ _("Breadcrumb") }}"> | ||
<ul class="breadcrumbs inline-list"> | ||
<li> | ||
<a href="/{% if not (locale === config.defaultLanguage) %}{{ config.languages[locale].slug }}{% endif %}"> | ||
{{ _("Home") }} | ||
</a> | ||
</li> | ||
{% for page in navPages %} | ||
<li><a href="{{ page.url }}">{{ page.title }}</a></li> | ||
{% endfor %} | ||
<li aria-current="page">{{ eleventyNavigation.title }}</li> | ||
</ul> | ||
</nav> | ||
<h1 class="article-title">{{ title }}</h1> | ||
</div> | ||
</header> | ||
|
||
<div class="wrapper wrapper__article"> | ||
{% include "partials/content.njk" %} | ||
|
||
{% if not navPages.length %} | ||
{# If displaying a listing page of articles #} | ||
{% set childPages = collections[category + "_" + locale] | eleventyNavigation(eleventyNavigation.key) %} | ||
<nav class="list-articles__contents" aria-label="{{ _i("${categoryName} contents", {categoryName: eleventyNavigation.key}) }}"> | ||
<ul> | ||
{# Output page links in alphabetical order #} | ||
{% for page in childPages |sort(false, true, "title") %} | ||
<li><a href="{{ page.url }}">{{ page.title }}</a></li> | ||
{% endfor %} | ||
</ul> | ||
</nav> | ||
{% else %} | ||
{% include "partials/editOnGitHub.njk" %} | ||
{% endif %} | ||
</div> | ||
{% endblock %} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
<div class="flc-toc-tocContainer docs-template-uio-toc"></div> | ||
<div class="flc-toc-tocContainer"></div> | ||
|
||
<div class="docs-template-articleContent"> | ||
{{ content | safe }} | ||
</div> | ||
{{ content | safe }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<p class="docs-template-githubLink"> | ||
<p class="githubLink"> | ||
<a href="https://github.com/inclusive-design/guide.inclusivedesign.ca/edit/main/src{{ editLinkPath }}" rel="nofollow" target="_blank" class="link-external"> | ||
{{ _("Edit this Page on GitHub") }} | ||
{% svg_sprite "logo-github" %}{{ _("Edit this Page on GitHub") }} | ||
</a> | ||
</p> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
<footer class="row docs-template-footer fl-inverted-color"> | ||
<p> | ||
{% set footer_community %}<a href='https://wiki.fluidproject.org/display/fluid/The+Inclusive+Design+Guide' rel='nofollow' target='_blank'>{{ _("community members") }}</a>{% endset %} | ||
{% set footer_org %}</br><a href='{{ _(site.orgURL) }}' rel='nofollow' target='_blank'>{{ _(site.org) }}</a>{% endset %} | ||
{% set footer_institute %}<a href='{{ _(site.instituteURL) }}' target='_blank'>{{ _(site.institute) }}</a>{% endset %} | ||
{{ _i("Created by the ${community} of the ${org} at ${institute}, and supported by", { | ||
community: footer_community, | ||
org: footer_org, | ||
institute: footer_institute | ||
}) | safe }} | ||
</p> | ||
<footer class="header-footer-bg header-footer-color fl-inverted-color"> | ||
<div class="wrapper wrapper_site_footer"> | ||
<p> | ||
{% set footer_community %}<a href='https://wiki.fluidproject.org/display/fluid/The+Inclusive+Design+Guide' rel='nofollow' target='_blank'>{{ _("community members") }}</a>{% endset %} | ||
{% set footer_org %}</br><a href='{{ _(site.orgURL) }}' rel='nofollow' target='_blank'>{{ _(site.org) }}</a>{% endset %} | ||
{% set footer_institute %}<a href='{{ _(site.instituteURL) }}' target='_blank'>{{ _(site.institute) }}</a>{% endset %} | ||
{{ _i("Created by the ${community} of the ${org} at ${institute}, and supported by", { | ||
community: footer_community, | ||
org: footer_org, | ||
institute: footer_institute | ||
}) | safe }} | ||
</p> | ||
<p> | ||
<a class="footer__logo-links" aria-label="FLOE Project" href="http://www.floeproject.org/" target="_blank">{% svg_sprite "logo-floe" %}</a> | ||
<a class="footer__logo-links" aria-label="Prosperity for All" href="http://www.prosperity4all.eu/" target="_blank">{% svg_sprite 'logo-p4a' %}</a><br/> | ||
</p> | ||
<p> | ||
{{ _i("Hosted with ${netlify}.", {netlify: "<a href='https://netlify.com/'>Netlify</a>"}) | safe }} | ||
</p> | ||
|
||
<p> | ||
<a class="footer-logo-links" aria-label="FLOE Project" href="http://www.floeproject.org/" target="_blank">{% svg_sprite "logo-floe" %}</a> | ||
<a class="footer-logo-links" aria-label="Prosperity for All" href="http://www.prosperity4all.eu/" target="_blank">{% svg_sprite "logo-p4a" %}</a><br/> | ||
</p> | ||
|
||
<p> | ||
{{ _i("Hosted with ${netlify}.", {netlify: "<a href='https://netlify.com/'>Netlify</a>"}) | safe }} | ||
</p> | ||
|
||
<p> | ||
{% set license %}<a rel='license' href='{{ _(site.licenseURL) }}'>{{ _(site.license) }}</a>{% endset %} | ||
{{ _i("This documentation is licensed under a ${license}.", {license: license}) | safe }} | ||
</p> | ||
<p> | ||
{% set license %}<a rel='license' href='{{ _(site.licenseURL) }}'>{{ _(site.license) }}</a>{% endset %} | ||
{{ _i("This documentation is licensed under a ${license}.", {license: license}) | safe }} | ||
</p> | ||
</div> | ||
</footer> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,28 @@ | ||
<!-- Skip Link --> | ||
<nav id="skip" class="fl-inverted-color"> | ||
<a href="#content" class="docs-template-skip-content">{{ _("Skip to Content") }}</a> | ||
<nav class="fl-inverted-color"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we add an aria-label to this? Perhaps also "Skip to Content"? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think it's necessary since the link is descriptive enough. |
||
<a id="skip-to-content" href="#content">{{ _("Skip to Content") }}</a> | ||
</nav> | ||
<!-- END skip link --> | ||
|
||
<header class="ignore-for-TOC row fl-inverted-color"> | ||
<header class="ignore-for-TOC site-header header-footer-bg header-footer-color fl-inverted-color"> | ||
{% include "partials/uio.njk" %} | ||
|
||
{% localeLink locale, translationKey, category, collections %} | ||
<div class="menus"> | ||
{% include 'partials/language.njk' %} | ||
{% include 'partials/nav-mobile.njk' %} | ||
</div> | ||
|
||
<div class="small-12 column docs-template-header"> | ||
<a class="" href="/{% if not (locale === config.defaultLanguage) %}{{ config.languages[locale].slug }}{% endif %}" title="{{ _i("Home: ${siteName}", {siteName: _(site.title)}) }}"> | ||
{% svg_sprite "logo-idrc" %} | ||
<h1>{{ _(site.title) }}</h1> | ||
<div class="wrapper"> | ||
<a class="banner" href="/{% if not (locale === config.defaultLanguage) %}{{ config.languages[locale].slug }}{% endif %}" title="{{ _i("Home: ${siteName}", {siteName: _(site.title)}) }}"> | ||
<span class="banner-logo"> | ||
{% svg_sprite "logo-idrc" %} | ||
</span> | ||
<h1 class="banner-heading">{{ _(site.title) }}</h1> | ||
</a> | ||
|
||
<!-- Mobile Menu --> | ||
<nav class="right show-for-small-only docs-template-nav-mobile"> | ||
<ul id="menu"> | ||
<li class="docs-template-dropDown-header"><span class="docs-template-nav-mobile-icon"></span> | ||
<ul class="docs-template-dropDown"> | ||
{% include "partials/menu.njk" %} | ||
</ul> | ||
</li> | ||
</ul> | ||
</nav> | ||
</div> | ||
{% include 'partials/nav-desktop.njk' %} | ||
|
||
<!-- "Desktop" Menu --> | ||
<div class="docs-template-header"> | ||
<nav class="idg-tabs small-12 column show-for-medium-up"> | ||
<ul class="inline-list"> | ||
{% include "partials/menu.njk" %} | ||
</ul> | ||
</nav> | ||
</div> | ||
|
||
|
||
</header> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<nav class="idg-language-picker menu" aria-labelledBy="idg-language-button"> | ||
<button id="idg-language-button" class="disclosure-button" aria-expanded="false" aria-controls="idg-language-list"> | ||
{% svg_sprite "icon-language" %} | ||
{{ _("Language") }} | ||
</button> | ||
<ul id="idg-language-list" class="menu-list"> | ||
{% localeLink locale, translationKey, category, collections %} | ||
</ul> | ||
</nav> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<nav class="nav nav-desktop" aria-label="menu"> | ||
<ul class="inline-list nav-list nav-list__desktop"> | ||
{% include "partials/menu.njk" %} | ||
</ul> | ||
</nav> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<nav class="idg-menu-nav menu" aria-labelledBy="idg-menu-nav-button"> | ||
<button id="idg-menu-nav-button" class="disclosure-button" aria-expanded="false" aria-controls="idg-nav-menu-list"> | ||
{% svg_sprite "icon-menu" %} | ||
{{ _("Menu") }} | ||
</button> | ||
<ul id="idg-menu-nav-list" class="menu-list"> | ||
{% include "partials/menu.njk" %} | ||
</ul> | ||
</nav> |
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you pin this to a specific version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What version should be used?