Skip to content

Commit

Permalink
apply h1 thickline globally
Browse files Browse the repository at this point in the history
  • Loading branch information
delisma committed Oct 17, 2023
2 parents 76ead45 + a06afeb commit d923bf0
Show file tree
Hide file tree
Showing 55 changed files with 3,964 additions and 647 deletions.
21 changes: 9 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
# Base on: Starefossen/docker-github-pages

FROM starefossen/ruby-node:2-6-alpine
ARG RUBY_VERSION=2.7.3
FROM ruby:$RUBY_VERSION

ENV GITHUB_GEM_VERSION 227
ENV JSON_GEM_VERSION 2.6.2

RUN apk --update add --virtual build_deps \
build-base ruby-dev libc-dev linux-headers \
RUN apt-get update \
&& apt-get install -y \
git \
locales \
make \
nodejs \
&& gem update --system \
&& gem install --verbose --no-document \
json:${JSON_GEM_VERSION} \
json \
github-pages \
jekyll-github-metadata \
minitest \
&& gem install rake html-proofer \
&& apk del build_deps \
&& apk add git \
&& mkdir -p /usr/src/app \
&& rm -rf /usr/lib/ruby/gems/*/cache/*.gem

# github-pages:${GITHUB_GEM_VERSION} \

WORKDIR /usr/src/app

EXPOSE 4000 80
Expand Down
11 changes: 10 additions & 1 deletion Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ module.exports = (grunt) ->
[
"clean:dist"
"sass:all"
"concat:supports"
"concat:plugins"
"copy:assets"
"copy:fonts"
Expand Down Expand Up @@ -507,6 +508,14 @@ module.exports = (grunt) ->
separator: ","
src: "sites/**/index.json-ld"
dest: "_data/sites.json"
supports:
options:
stripBanners: false
src: [
"<%= themeDist %>/css/theme.css"
"node_modules/wet-boew/src/polyfills/supports/*.css"
]
dest: "<%= themeDist %>/css/theme.css"

# Placeholder modal for multimélo task
mélimélo:
Expand Down Expand Up @@ -620,7 +629,7 @@ module.exports = (grunt) ->
layouts:
expand: true
flatten: true
src: "{sites,components,templates}/**/layouts/**.*"
src: "{sites,components,templates,docs}/**/layouts/**.*"
dest: "<%= jekyllDist %>/_layouts"
includes:
files: [
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
![Statut du déploiement continu](https://github.com/wet-boew/GCWeb/workflows/Continuous%20deployment/badge.svg) [![Statut de devDependency](https://david-dm.org/wet-boew/GCWeb/dev-status.png?theme=shields.io)](https://david-dm.org/wet-boew/GCWeb#info=devDependencies) [![Pacte du contributeur](https://img.shields.io/badge/Pacte%20du%20contributeur-v1.4%20adopt%E9-ff69b4.svg)](CODE-OF-CONDUCT.md) [![Slack](https://img.shields.io/badge/Slack-Espace%20de%20travaill%20du%20systemes%20de%20conception%20GC-yellow?style=flat&logo=slack)](https://join.slack.com/t/design-gc-conception/shared_invite/enQtODE1OTc5Mzg5NzQ4LWQ3MjZjMTdjMjk2ZTZmMTJjYWQ3ZmRiNDYwYjRmN2NjYzQyNjFlNDBlY2FkNWE1ODg2YjExY2QwZmVjN2MwMGM)

([English](#gcweb-theme-de-canada-da))
([English](#gcweb---canadaca-theme))

# CGWeb - Thème de Canada.ca
# GCWeb - Thème de Canada.ca

[Aller vers le site officiel de cette référence d'implémentation du thème de Canada.ca (GCWeb)](https://wet-boew.github.io/GCWeb/)

Expand Down Expand Up @@ -36,7 +36,7 @@ ______________________
![Continuous deployment status](https://github.com/wet-boew/GCWeb/workflows/Continuous%20deployment/badge.svg) [![devDependency Status](https://david-dm.org/wet-boew/GCWeb/dev-status.png?theme=shields.io)](https://david-dm.org/wet-boew/GCWeb#info=devDependencies) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](code-of-conduct.md)
[![Slack](https://img.shields.io/badge/Slack-GC%20Design%20System%20workspace-yellow?style=flat&logo=slack)](https://join.slack.com/t/design-gc-conception/shared_invite/enQtODE1OTc5Mzg5NzQ4LWQ3MjZjMTdjMjk2ZTZmMTJjYWQ3ZmRiNDYwYjRmN2NjYzQyNjFlNDBlY2FkNWE1ODg2YjExY2QwZmVjN2MwMGM)

([Français](#gcweb-theme-du-canada-ca))
([Français](#gcweb---thème-de-canadaca))

# GCWeb - Canada.ca theme

Expand Down
69 changes: 69 additions & 0 deletions _data/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,40 @@
]
}
}
,{
"@context": {
"@version": 2.0,
"dct": "http://purl.org/dc/terms/",
"title": { "@id": "dct:title", "@container": "@language" },
"description": { "@id": "dct:description", "@container": "@language" },
"modified": "dct:modified"
},
"title": {
"en": "Color (Foreground/Background)",
"fr": "Couleur (Premier plan/Arrière-plan)"
},
"description": {
"en": "Colors page including working examples to test how various text appears on different backgrounds.",
"fr": "Page de couleurs comprenant des exemples de travail pour tester la façon dont divers textes apparaissent sur différents arrière-plans."
},
"modified": "2023-04-28",
"componentName": "colour",
"status": "stable",
"pages": {
"docs": [
{
"title": "Color (Foreground/Background)",
"language": "en",
"path": "colour-en.html"
},
{
"title": "Couleur (Premier plan/Arrière-plan)",
"language": "fr",
"path": "colour-fr.html"
}
]
}
}
,{
"@context": {
"@version": 1.1,
Expand Down Expand Up @@ -113,4 +147,39 @@
]
}
}
,{
"@context": {
"@version": 1.1,
"dct": "http://purl.org/dc/terms/",
"title": { "@id": "dct:title", "@container": "@language" },
"description": { "@id": "dct:description", "@container": "@language" },
"modified": "dct:modified"
},
"title": {
"en": "Tables",
"fr": "Les Tables"
},
"description": {
"en": "Tables with custom styles",
"fr": "Tableaux avec des styles personalisés."
},
"modified": "2023-02-28",
"componentName": "tables",
"processing": "baseline",
"status": "stable",
"pages": {
"examples": [
{
"title": "Tables",
"language": "en",
"path": "table-en.html"
},
{
"title": "Tables",
"language": "fr",
"path": "table-fr.html"
}
]
}
}
]
11 changes: 10 additions & 1 deletion _data/méli-mélo.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"nom": "gc-thématique",
"libs": [
"th-canadaday",
"th-winterlude"
"th-winterlude",
"th-zev"
]
}
],
Expand All @@ -40,6 +41,14 @@
"nom": "th-canadaday",
"mainpage": "canada-day.html"
},
{
"nom": "th-winterlude",
"mainpage": "winterlude.html"
},
{
"nom": "th-zev",
"mainpage": "zev.html"
},
{
"nom": "2022-09-svgimagemap",
"mainpage": "bcmap.html"
Expand Down
26 changes: 18 additions & 8 deletions _data/sites.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,16 @@
"title": "Page de contenu - Modèle de session ouverte",
"language": "fr",
"path": "signedon-fr.html"
},
{
"title": "Active user session",
"language": "en",
"path": "activeusersession-en.html"
},
{
"title": "Session utilisateur active",
"language": "fr",
"path": "activeusersession-fr.html"
}
]
}
Expand Down Expand Up @@ -387,25 +397,25 @@
"modified": "dct:modified"
},
"title": {
"en": "H1 Thickline",
"fr": "H1 Thickline"
"en": "GC-H1",
"fr": "GC-H1"
},
"description": {
"en": "Documentation on how to use the h1.",
"fr": "Documentation sur l'utilisation du h1."
"en": "Documentation on the default H1 with short bold red underline.",
"fr": "Documentation à propos du H1 par défaut souligné d'une courte ligne rouge en gras."
},
"modified": "2023-06-13",
"componentName": "h1",
"modified": "2023-07-24",
"componentName": "gc-h1",
"status": "stable",
"pages": {
"docs": [
{
"title": "H1 Thickline",
"title": "GC-H1",
"language": "en",
"path": "h1-en.html"
},
{
"title": "H1 Thickline",
"title": "GC-H1",
"language": "fr",
"path": "h1-fr.html"
}
Expand Down
37 changes: 37 additions & 0 deletions _includes/alert-community-stable.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{%- if page.language == "fr" -%}
<div class="alert alert-info">
<p>Veuillez noter que la présente page web représente une contribution communautaire et qu'elle <strong>ne bénéficie pas</strong> de la validation ni de l'approbation formelle du Bureau de la transformation numérique comparativement à une conception officielle. Il est à souligner que cette contribution ne va pas à l'encontre d'une version officielle publiée au moment de l'ajout. Si une conception officielle équivalente est élaborée et soit formellement publiée, il est possible que la conception démontrée sur la présente page en diffère en partie ou en totalité.</p>

<p>Cette conception est <strong>stable</strong> et par conséquent elle bénificie des mêmes avantages que toutes autres fonctionnalités et conceptions stables telles que définies par <a href="https://wet-boew.github.io/wet-boew-documentation/decision/14.html" hreflang="en">l'ébauche de l'API publique de version de GCWeb</a>.</p>

{%- if page.concerns -%}
<p>Veuillez noter, cet example a soulevé les préoccupations et/ou les commentaires suivants qui devrait être prise en compte:</p>
<ul>
{% for concern in page.concerns %}
<li>{{ concern }}</li>
{% endfor %}
</ul>
{%- endif -%}
{%- if page.discussionUrl -%}
<p><a href="{{ page.discussionUrl }}">Participer à la discussion.</a></p>
{%- endif -%}
</div>
{%- elsif page.language == "en" -%}
<div class="alert alert-info">
<p>Please note that the current web page represents a community contribution and <strong>does not yet have</strong> formal validation or approval from the Digital Transformation Office compared to an official design. It should be noted that this contribution does not contradict any officially published version at the time of its addition. It is possible that when an equivalent official design is developed and gets formally published, it may differ partially or entirely from the design shown on this page.</p>

<p>This <strong>stable</strong> design does share the same benefits as any other stable functionalities and design as defined by the <a href="https://wet-boew.github.io/wet-boew-documentation/decision/14.html">GCWeb public versioning API draft</a>.</p>

{%- if page.concerns -%}
<p>Please note, this example have raised the following concerns/comments for consideration:</p>
<ul>
{% for concern in page.concerns %}
<li>{{ concern }}</li>
{% endfor %}
</ul>
{%- endif -%}
{%- if page.discussionUrl -%}
<p><a href="{{ page.discussionUrl }}">Participate at the discussion</a></p>
{%- endif -%}
</div>
{%- endif -%}
Loading

0 comments on commit d923bf0

Please sign in to comment.