Skip to content

Commit

Permalink
Deleted other commits, squashed and merged
Browse files Browse the repository at this point in the history
  • Loading branch information
duboisp authored and SebastianBurke committed Nov 7, 2023
2 parents e2c4419 + ad51b64 commit 4e16d0a
Show file tree
Hide file tree
Showing 8 changed files with 229 additions and 10 deletions.
3 changes: 2 additions & 1 deletion _data/méli-mélo.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"2021-05-conjunction",
"2023-09-menu",
"2023-09-distance-calculator",
"2023-09-collection-sort"
"2023-09-collection-sort",
"2021-05-steps"
]
},
{
Expand Down
92 changes: 92 additions & 0 deletions common/borders/borders-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
---
{
"title": "Borders",
"language": "en",
"altLangPage": "borders-fr.html",
"breadcrumbs":
[
{
"title": "GCWeb home",
"link": "https://wet-boew.github.io/themes-dist/GCWeb/index-en.html"
}
],
"secondlevel": false,
"dateModified": "2023-10-25",
"share": "true"
}
---

<h2>CSS Class</h2>
<dl class="dl-horizontal">
<dt><code>.brdr-left</code></dt>
<dd>Sets a border to the left of the element</dd>
<dt><code>.brdr-rght</code></dt>
<dd>Sets a border to the right of the element</dd>
<dt><code>.brdr-bttm</code></dt>
<dd>Sets a border below the element</dd>
<dt><code>.brdr-tp</code></dt>
<dd>Sets a border on top of the element</dd>
<dt><code>.brdr-0</code></dt>
<dd>Removes borders</dd>
<dt><code>.brdr-rds-0</code></dt>
<dd>Removes border radius</dd>
<dt><code>.well</code></dt>
<dd>Sets contents in a bordered box with default values (can be used with .brdr-0 and .brdr-rds-0)</dd>
</dl>
<div class="row">
<div class="col-md-6">
<h2>Appearance</h2>
<div class="custom-block">
<p class="mrgn-bttm-10 brdr-tp brdr-lft">
Left and top border
</p>
</div>
<br>
<br>
<div class="custom-block">
<p class="mrgn-bttm-10 brdr-bttm brdr-rght" style="text-align: right">
Right and bottom border
</p>
</div>
<br>
<div class="custom-block">
<p class="mrgn-bttm-30 brdr-bttm brdr-lft brdr-0">
No borders
</p>
</div>
<br>
<div class="custom-block">
<p class="well">
Well with default values
</p>
</div>
<div class="custom-block">
<p class="well brdr-0 brdr-rds-0">
Borderless well with no border radius
</p>
</div>
</div>
<div class="col-md-6">
<h2>Code</h2>
<div class="custom-block">
<pre><code>// Left and top border
&lt;p <strong>class="brdr-lft brdr-tp"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Right and bottom border
&lt;p <strong>class="brdr-rght brdr-bttm"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// No borders
&lt;p <strong>class="brdr-bttm brdr-lft brdr-0"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Well with default values
&lt;p <strong>class="well"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Borderless well with no border radius
&lt;p <strong>class="well brdr-0 brdr-rds-0"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
</div>
</div>
92 changes: 92 additions & 0 deletions common/borders/borders-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
---
{
"title": "Bordures",
"language": "fr",
"altLangPage": "borders-en.html",
"breadcrumbs":
[
{
"title": "Accueil GCWeb",
"link": "https://wet-boew.github.io/themes-dist/GCWeb/index-fr.html"
}
],
"secondlevel": false,
"dateModified": "2023-10-25",
"share": "true"
}
---

<h2>Classe CSS</h2>
<dl class="dl-horizontal">
<dt><code>.brdr-left</code></dt>
<dd>Définit une bordure à gauche de l'élément</dd>
<dt><code>.brdr-rght</code></dt>
<dd>Définit une bordure à droite de l'élément</dd>
<dt><code>.brdr-bttm</code></dt>
<dd>Définit une bordure en dessous de l'élément</dd>
<dt><code>.brdr-tp</code></dt>
<dd>Définit une bordure en haut de l'élément</dd>
<dt><code>.brdr-0</code></dt>
<dd>Supprime les bordures</dd>
<dt><code>.brdr-rds-0</code></dt>
<dd>Supprime le rayon des bordures</dd>
<dt><code>.well</code></dt>
<dd>Place le contenu dans une boîte bordée avec des valeurs par défaut (peut être utilisé avec .brdr-0 et .brdr-rds-0)</dd>
</dl>
<div class="row">
<div class="col-md-6">
<h2>Apparence</h2>
<div class="custom-block">
<p class="mrgn-bttm-10 brdr-tp brdr-lft">
Bordure gauche et haut
</p>
</div>
<br>
<br>
<div class="custom-block">
<p class="mrgn-bttm-10 brdr-bttm brdr-rght" style="text-align: right">
Bordure droite et bas
</p>
</div>
<br>
<div class="custom-block">
<p class="mrgn-bttm-30 brdr-bttm brdr-lft brdr-0">
Pas de bordures
</p>
</div>
<br>
<div class="custom-block">
<p class="well">
Boîte avec valeurs par défaut
</p>
</div>
<div class="custom-block">
<p class="well brdr-0 brdr-rds-0">
Boîte sans bordure et sans rayon
</p>
</div>
</div>
<div class="col-md-6">
<h2>Code</h2>
<div class="custom-block">
<pre><code>// Bordure gauche et haut
&lt;p <strong>class="brdr-lft brdr-tp"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Bordure droite et bas
&lt;p <strong>class="brdr-rght brdr-bttm"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Pas de bordures
&lt;p <strong>class="brdr-bttm brdr-lft brdr-0"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Boîte avec valeurs par défaut
&lt;p <strong>class="well"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
<div class="custom-block">
<pre><code>// Boîte sans bordure et sans rayon
&lt;p <strong>class="well brdr-0 brdr-rds-0"</strong>&gt;...&lt;/p&gt;</code></pre>
</div>
</div>
</div>
34 changes: 34 additions & 0 deletions common/borders/index.json-ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"@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": "Borders",
"fr": "Bordures"
},
"description": {
"en": "Borders to seperate components",
"fr": "Ajout de bordure sur des éléments"
},
"modified": "2023-10-25",
"componentName": "borders",
"status": "stable",
"pages": {
"docs": [
{
"title": "Borders",
"language": "en",
"path": "borders-en.html"
},
{
"title": "Bordures",
"language": "fr",
"path": "borders-fr.html"
}
]
}
}
4 changes: 2 additions & 2 deletions index-en.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: GCWeb, the WET-BOEW Canada.ca theme
altLangPage: index-fr.html
dateModified: 2023-09-26
dateModified: 2023-10-25
description: "Home page describing all the components of the Canada.ca theme, named GCWeb."
layout: no-container
language: en
Expand All @@ -19,7 +19,7 @@ css:
<p>The page templates and design patterns below comprise a reference implementation of the <a href="https://design.canada.ca">Canada.ca design system</a>, including the mandatory requirement of the Content and Information Architecture (C&amp;IA) Specification. Government of Canada departments and agencies can contribute additional patterns and templates via <a href="https://github.com/wet-boew/GCWeb">GCWeb github repository</a>.</p>
</div>
<div class="col-xs-12 col-md-auto pull-right">
<p><a href="https://github.com/wet-boew/GCWeb/archive/v13.9.1.zip" class="btn btn-primary">Download GCWeb theme <strong>v13.9.1</strong></a><br />
<p><a href="https://github.com/wet-boew/GCWeb/archive/v13.10.0.zip" class="btn btn-primary">Download GCWeb theme <strong>v13.10.0</strong></a><br />
<small>(<time>{{ page.dateModified | date: '%F' }}</time> - <a href="https://github.com/wet-boew/gcweb/releases/latest">Release notes</a>)</small></p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions index-fr.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: GCWeb, le thème WET-BOEW de Canada.ca
altLangPage: index-en.html
dateModified: 2023-09-26
dateModified: 2023-10-25
description: "Page d'accueil décrivant l'ensemble des composants du thème de Canada.ca, nommé GCWeb."
layout: no-container
language: fr
Expand All @@ -19,7 +19,7 @@ css:
<p>Les gabarits et les conceptions communes si dessous sont une référence d'implémentation du <a href="https://conception.canada.ca">Système de conception de Canada.ca</a>, incluant les exigences obligatoire de la spécifications du contenu et de l’architecture de l'information (C&amp;AI) pour Canada.ca. Les ministères et organisme du gouvernement du Canada peuvent y contribuer en publiant leur modèle et leur conception commune via le <a href="https://github.com/wet-boew/GCWeb">dépôt github de GCWeb</a>.</p>
</div>
<div class="col-xs-12 col-md-auto pull-right">
<p><a href="https://github.com/wet-boew/GCWeb/archive/v13.9.1.zip" class="btn btn-primary">Télécharger le thème <strong>GCWeb v13.9.1</strong></a><br />
<p><a href="https://github.com/wet-boew/GCWeb/archive/v13.10.0.zip" class="btn btn-primary">Télécharger le thème <strong>GCWeb v13.10.0</strong></a><br />
<small>(<time>{{ page.dateModified | date: '%F' }}</time> - <a href="https://github.com/wet-boew/gcweb/releases/latest">Note de version</a>)</small></p>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "GCWeb",
"version": "13.9.1",
"version": "13.10.0",
"description": "Web Experience Toolkit (WET): Canada.ca Theme Reorg",
"main": "index.html",
"scripts": {
Expand All @@ -13,7 +13,7 @@
"license": "MIT",
"dependencies": {
"bootstrap-sass": "3.4.1",
"wet-boew": "github:wet-boew/wet-boew#v4.0.69"
"wet-boew": "github:wet-boew/wet-boew#v4.0.70"
},
"browserslist": [
"last 2 versions",
Expand Down

0 comments on commit 4e16d0a

Please sign in to comment.