Skip to content
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

feat: Create layered-navigation.html #34

Draft
wants to merge 99 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ade5dc6
feat: Create layered-navigation.html
Nov 9, 2022
b20b3b3
feat: Create sliding-nav-2023.html
Dec 19, 2022
cd7f0c7
feat: Create sliding-nav-2023.html
Dec 19, 2022
04c0c62
fix
jmealing Jan 3, 2023
4da0830
Create for-jane.html
jmealing Jan 3, 2023
66160f9
delete
jmealing Jan 3, 2023
47ea075
jobs to theme style
jmealing Jan 4, 2023
3e58ece
Update jobs.html
jmealing Jan 4, 2023
ed7dbce
Update jobs.html
jmealing Jan 4, 2023
48faccf
Merge branch 'feat/layered-navigation' of https://github.com/gc-proto…
jmealing Jan 9, 2023
0f4d3d9
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
c4857c0
remove container causing right expansion
jmealing Jan 9, 2023
2c77947
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
d9ad3ef
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
15aad40
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
3db892a
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
6e49ae6
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
9e15061
technically an h4 of this page
jmealing Jan 9, 2023
416f8a0
Update jobs.html
jmealing Jan 9, 2023
4ec3740
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
fbcde41
set up media sizes
jmealing Jan 9, 2023
f80b4ef
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
2a5dc74
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
c0ec04b
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
b1f4769
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
ba49d80
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
c597e98
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
d524938
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
b5d6e0a
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
80a358c
use class instead
jmealing Jan 9, 2023
16a5878
test
jmealing Jan 9, 2023
53d1194
updates
jmealing Jan 9, 2023
8b15d3a
Update jobs.html
jmealing Jan 9, 2023
c3613ca
Update jobs.html
jmealing Jan 9, 2023
3069ca3
update
jmealing Jan 9, 2023
b85acf5
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
8111ed2
css hide/show
jmealing Jan 9, 2023
3d5fbd7
visible on hover too
jmealing Jan 9, 2023
d47c91d
combine
jmealing Jan 9, 2023
8c0320f
Update sliding-nav-2023.html
jmealing Jan 9, 2023
5a1965e
Update sliding-nav-2023.html
jmealing Jan 9, 2023
23d85cd
move positioning so mobile is default
jmealing Jan 9, 2023
57a375d
doesn't work to toggle
jmealing Jan 9, 2023
5d48b0e
going to use toggle or doaction - abandoning this idea
jmealing Jan 9, 2023
b6e2710
fix min width issue
jmealing Jan 9, 2023
e686499
Update alpha-layered-theme-menu-mr-tp.css
jmealing Jan 9, 2023
a859789
Update sliding-nav-2023.html
Jan 13, 2023
71d7299
Update sliding-nav-2023.html
Jan 23, 2023
dc3fb0e
Update jobs.html
jmealing Jan 30, 2023
c298dbd
updates
jmealing Jan 31, 2023
063b97a
updates
jmealing Jan 31, 2023
1f4e432
updates
jmealing Jan 31, 2023
2cc34e0
Update canada-world.html
jmealing Jan 31, 2023
08a3153
Update culture.html
jmealing Jan 31, 2023
9d7d103
Update defence.html
jmealing Jan 31, 2023
3768226
fix id
jmealing Jan 31, 2023
11f14db
Update environment.html
jmealing Jan 31, 2023
9a4164f
Update health.html
jmealing Jan 31, 2023
0cc99d1
Update indigenous.html
jmealing Feb 1, 2023
a4b5fa1
Update immigration.html
jmealing Feb 1, 2023
3950e9f
Update taxes.html
jmealing Feb 1, 2023
db1becd
update
jmealing Feb 1, 2023
73a6b07
Update policing.html
jmealing Feb 1, 2023
b134bcf
fix: Update front matter
Feb 1, 2023
87680b2
Update science.html
jmealing Feb 1, 2023
f4138e7
Update transport.html
jmealing Feb 1, 2023
decc3bf
Update science.html
jmealing Feb 1, 2023
bf2bde7
Update transport.html
jmealing Feb 1, 2023
76c8525
Update travel.html
jmealing Feb 1, 2023
82ed303
fix
jmealing Feb 1, 2023
3ffc578
Update money.html
jmealing Feb 1, 2023
52803cb
Update veterans.html
jmealing Feb 1, 2023
03c091c
Update sliding-nav-2023.html
Feb 1, 2023
9368d9e
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
e081a9f
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
c088e16
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
e2d894d
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
efb0b9e
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
6c8d98d
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
e2f2bef
css
jmealing Feb 3, 2023
afa65ba
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
ccc653a
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
138c58f
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
44c5199
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 3, 2023
d286d23
button active style and js
jmealing Feb 5, 2023
46c065c
f
jmealing Feb 5, 2023
63cac4c
f
jmealing Feb 5, 2023
3d75f3e
f
jmealing Feb 5, 2023
fb913c2
try editing it in browser
jmealing Feb 5, 2023
583365e
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 5, 2023
7490fd0
desktop highlight button on select
jmealing Feb 5, 2023
020567b
Refactor themes and main html pages
Feb 6, 2023
7b02462
rmv border in desktop
jmealing Feb 8, 2023
d64455f
Update alpha-layered-theme-menu-mr-tp.css
jmealing Feb 8, 2023
a98cb0f
align with sign in button
jmealing Feb 8, 2023
6cf442b
Add a json-manager
Feb 14, 2023
e1e5ab9
add spring
jmealing Feb 20, 2023
81c8243
Merge branch 'feat/layered-navigation' of https://github.com/gc-proto…
jmealing Feb 20, 2023
3b31dc4
wrong branch
jmealing Feb 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
GIT
remote: https://github.com/benbalter/jekyll-remote-theme.git
revision: 8d4b7a70ef293b38df93944c5c7953d5c9c3079a
branch: master
specs:
jekyll-remote-theme (0.4.3)
addressable (~> 2.0)
jekyll (>= 3.5, < 5.0)
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
rubyzip (>= 1.3.0, < 3.0)

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.10)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
forwardable-extended (2.6.0)
http_parser.rb (0.8.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jekyll (4.3.1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.30.0)
rubyzip (2.3.2)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.3.0)
webrick (1.7.0)

PLATFORMS
x86_64-darwin-21
x86_64-darwin-22

DEPENDENCIES
jekyll
jekyll-remote-theme!

BUNDLED WITH
2.3.26
17 changes: 17 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
# Jekyll settings
defaults:
-
scope:
path: working-on/sliding-nav/
values:
css:
- /working-on/sliding-nav/layered-theme-menu-mr-tp.css
- https://use.fontawesome.com/releases/v5.6.3/css/all.css
layout: without-h1
lang: en
nomenu: true
pageclass: cnt-wdth-lmtd

plugins:
- jekyll-remote-theme

remote_theme: wet-boew/gcweb-jekyll
37 changes: 37 additions & 0 deletions _includes/authentication/authentication.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<section id="wb-so">
<h2 class="wb-inv">
{%- unless page.auth.type == "contextual" -%}
{{ i18nText-signOnOff }}
{%- else -%}
{{ i18nText-signIn }}
{%- endunless -%}
</h2>
{%- if page.auth.type == "contextual" -%}
{% assign label = page.auth.label | truncate: 12, "" %}
{% assign labelExtended = page.auth.labelExtended | truncate: 25, "" %}
{%- if page.auth.json -%}
<a class="btn btn-primary custom" href="{{ page.auth.link }}" data-wb-json='{ "url": "#[contextual]/current/auth/link", "type": "attr", "attr": "href" }'>
<span class="visible-xs">{{ label }}</span>
<span class="hidden-xs" data-json-replace="#[contextual]/current/auth/labelExtended">{{ labelExtended }}</span>
</a>
{%- else -%}
<a class="btn btn-primary" href="{{ page.auth.link }}">
{%- if label and labelExtended -%}
<span class="visible-xs">{{ label }}</span>
<span class="hidden-xs">{{ labelExtended }}</span>
{%- elsif label -%}
{{ label }}
{%- else -%}
{{ i18nText-signIn }}
{% endif %}
</a>
{%- endif -%}
{%- elsif page.auth.type == "signedoff" -%}
<button class="btn btn-default" type="button">{{ i18nText-signOnRegister }}</button>
<button class="btn btn-primary" type="button">{{ i18nText-signIn }}</button>
{% else %}
<button class="btn btn-default" type="button">{{ i18nText-signAccount }}</button>
<button class="btn btn-primary" type="button">{{ i18nText-signOut }}</button>
<p class="small mrgn-tp-sm">{{ i18nText-signAs }} <span class="nowrap">John Doe</span></p>
{%- endif -%}
</section>
186 changes: 186 additions & 0 deletions _includes/footers/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
{%- capture footerIncludeVersion -%}
{%- if page.includes.footer -%}
{{ page.includes.footer }}
{%- else -%}
{{ site.includes.footer }}
{%- endif -%}
{%- endcapture -%}

{%- capture contextualFooterTitle -%}
{%- if page.contextualFooter.title -%}
{{ page.contextualFooter.title }}
{%- elsif site.global.contextualFooter.title[i18nText-lang] -%}
{{ site.global.contextualFooter.title[i18nText-lang] }}
{%- endif -%}
{%- endcapture -%}

{%- capture termsUrl -%}
{%- if page.termsUrl -%}
{{ page.termsUrl }}
{%- elsif site.global.termsUrl[i18nText-lang] -%}
{{ site.global.termsUrl[i18nText-lang] }}
{%- else -%}
{{ i18nText-termsUrl }}
{%- endif -%}
{%- endcapture -%}

{%- capture privacyUrl -%}
{%- if page.privacyUrl -%}
{{ page.privacyUrl }}
{%- elsif site.global.privacyUrl[i18nText-lang] -%}
{{ site.global.privacyUrl[i18nText-lang] }}
{%- else -%}
{{ i18nText-privacyUrl }}
{%- endif -%}
{%- endcapture -%}

{%- comment -%} Footer version control, allow to use multiple version of an include to ease migration {%- endcomment -%}
{%- if footerIncludeVersion == "v2" -%}

{%- comment -%} +TODO+ Removal not before December 2023 {%- endcomment -%}
{% include footers/deprecated/footers-v2.html %}

{%- else -%}

<footer id="wb-info">
<h2 class="wb-inv">{{ i18nText-footerSite }}</h2>
{% unless page.noFooterContextual %}
{%- if contextualFooterTitle != "" and site.global.contextualFooter.links[i18nText-lang] or page.contextualFooter.links -%}
<div class="gc-contextual">
<div class="container">
<nav>
<h3>{{ contextualFooterTitle }}</h3>
{%- if page.contextualFooter.links == empty -%}<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3" data-wb-json='{
"url": "#[contextual]/current/contextualFooter/links",
"mapping": [
{ "selector": "a", "value": "/text" },
{ "selector": "a", "attr": "href", "value": "/url" }
]
}'>
{%- else -%}
<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
{%- endif -%}
{%- if page.contextualFooter.links -%}
{%- for link in page.contextualFooter.links -%}
<li><a href="{{ link.url }}">{{ link.text }}</a></li>
{%- if forloop.index > 5 -%}
{% break %}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- if site.global.contextualFooter.links -%}
{%- for link in site.global.contextualFooter.links[i18nText-lang] -%}
<li><a href="{{ link.url }}">{{ link.text }}</a></li>
{%- if forloop.index > 5 -%}
{% break %}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- if page.contextualFooter.links == empty -%}
<template>
<li data-display-none>
<a href></a>
</li>
</template>
{%- endif -%}
</ul>
</nav>
</div>
</div>
{%- endif -%}
{% endunless %}
{% unless page.noFooterMain %}
<div class="gc-main-footer">
<div class="container">
<nav>
<h3>{{ i18nText-goc }}</h3>
<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
{%- if i18nText-lang == "fr" -%}
<li><a href="https://www.canada.ca/fr/contact.html">Toutes les coordonnées</a></li>
<li><a href="https://www.canada.ca/fr/gouvernement/min.html">Ministères et organismes</a></li>
<li><a href="https://www.canada.ca/fr/gouvernement/systeme.html">À propos du gouvernement</a></li>
{%- elsif i18nText-lang == "en" -%}
<li><a href="https://www.canada.ca/en/contact.html">All Contacts</a></li>
<li><a href="https://www.canada.ca/en/government/dept.html">Departments and agencies</a></li>
<li><a href="https://www.canada.ca/en/government/system.html">About government</a></li>
{%- endif -%}
</ul>
<h4><span class="wb-inv">{{ i18nText-themeLinks }}</span></h4>
<ul class="list-unstyled colcount-sm-2 colcount-md-3">
{%- if i18nText-lang == "fr" -%}
<li><a href="https://www.canada.ca/fr/services/emplois.html">Emplois</a></li>
<li><a href="https://www.canada.ca/fr/services/immigration-citoyennete.html">Immigration et citoyenneté</a></li>
<li><a href="https://voyage.gc.ca/">Voyage et tourisme</a></li>
<li><a href="https://www.canada.ca/fr/services/entreprises.html">Entreprises</a></li>
<li><a href="https://www.canada.ca/fr/services/prestations.html">Prestations</a></li>
<li><a href="https://www.canada.ca/fr/services/sante.html">Santé</a></li>
<li><a href="https://www.canada.ca/fr/services/impots.html">Impôts</a></li>
<li><a href="https://www.canada.ca/fr/services/environnement.html">Environnement et ressources naturelles</a></li>
<li><a href="https://www.canada.ca/fr/services/defense.html">Sécurité nationale et défense</a></li>
<li><a href="https://www.canada.ca/fr/services/culture.html">Culture, histoire et sport</a></li>
<li><a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences</a></li>
<li><a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure</a></li>
<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
<li><a href="https://www.canada.ca/fr/services/finance.html">Argent et finance</a></li>
<li><a href="https://www.canada.ca/fr/services/science.html">Science et innovation</a></li>
<li><a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones</a></li>
<li><a href="https://www.canada.ca/fr/services/veterans.html">Vétérans et militaires</a></li>
<li><a href="https://www.canada.ca/fr/services/jeunesse.html">Jeunesse</a></li>
{%- elsif i18nText-lang == "en" -%}
<li><a href="https://www.canada.ca/en/services/jobs.html">Jobs</a></li>
<li><a href="https://www.canada.ca/en/services/immigration-citizenship.html">Immigration and citizenship</a></li>
<li><a href="https://travel.gc.ca/">Travel and tourism</a></li>
<li><a href="https://www.canada.ca/en/services/business.html">Business</a></li>
<li><a href="https://www.canada.ca/en/services/benefits.html">Benefits</a></li>
<li><a href="https://www.canada.ca/en/services/health.html">Health</a></li>
<li><a href="https://www.canada.ca/en/services/taxes.html">Taxes</a></li>
<li><a href="https://www.canada.ca/en/services/environment.html">Environment and natural resources</a></li>
<li><a href="https://www.canada.ca/en/services/defence.html">National security and defence</a></li>
<li><a href="https://www.canada.ca/en/services/culture.html">Culture, history and sport</a></li>
<li><a href="https://www.canada.ca/en/services/policing.html">Policing, justice and emergencies</a></li>
<li><a href="https://www.canada.ca/en/services/transport.html">Transport and infrastructure</a></li>
<li><a href="https://international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></li>
<li><a href="https://www.canada.ca/en/services/finance.html">Money and finance</a></li>
<li><a href="https://www.canada.ca/en/services/science.html">Science and innovation</a></li>
<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous peoples</a></li>
<li><a href="https://www.canada.ca/en/services/veterans.html">Veterans and military</a></li>
<li><a href="https://www.canada.ca/en/services/youth.html">Youth</a></li>
{%- endif -%}
</ul>
</nav>
</div>
</div>
{% endunless %}
<div class="gc-sub-footer">
<div class="container d-flex align-items-center">
<nav>
<h3 class="wb-inv">{{ i18nText-gocCorporate }}</h3>
<ul>
{% unless page.noFooterCorporate %}
{%- if i18nText-lang == "fr" -%}
<li><a href="https://www.canada.ca/fr/sociaux.html">Médias sociaux</a></li>
<li><a href="https://www.canada.ca/fr/mobile.html">Applications mobiles</a></li>
<li><a href="https://www.canada.ca/fr/gouvernement/a-propos.html">À propos de Canada.ca</a></li>
{%- elsif i18nText-lang == "en" -%}
<li><a href="https://www.canada.ca/en/social.html">Social media</a></li>
<li><a href="https://www.canada.ca/en/mobile.html">Mobile applications</a></li>
<li><a href="https://www.canada.ca/en/government/about.html">About Canada.ca</a></li>
{%- endif -%}
{% endunless %}
{%- if i18nText-lang == "fr" -%}
<li><a href="{{termsUrl}}">Avis</a></li>
<li><a href="{{privacyUrl}}">Confidentialité</a></li>
{%- elsif i18nText-lang == "en" -%}
<li><a href="{{termsUrl}}">Terms and conditions</a></li>
<li><a href="{{privacyUrl}}">Privacy</a></li>
{%- endif -%}
</ul>
</nav>
<div class="wtrmrk align-self-end">
<img src="{{ setting-resourcesBasePathTheme }}/{{ i18nText-wmmsImg }}" alt="{{ i18nText-wmms }}" />
</div>
</div>
</div>
</footer>

{%- endif -%}
4 changes: 3 additions & 1 deletion working-on/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,6 @@ $RECYCLE.BIN/
### Other ###
# Temporary folders
tmp/
temp/
temp/

node_modules/
4 changes: 4 additions & 0 deletions working-on/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: Working on index
---
Some text
22 changes: 22 additions & 0 deletions working-on/sliding-nav/accordion-nav-2023.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
feedbackPath: "ajax/report-problem-en.html"
title: Sliding navigation demo - Canada.ca mandatory template - Canada.ca
---
<button
aria-controls="gc-mnu-jobs"
aria-expanded="false"
aria-haspopup="true"
class="btn btn-link"
data-wb-doaction='[{
"action": "ajax",
"url": "themes/jobs.html #gc-mnu-jobs",
"container": "#target",
"type": "replace"
}]'
id="jobs-lg"
type="button">
Jobs
</button>
<div id="gc-mnu">
<div id="target">Some content</div>
</div>
Loading