Skip to content

Commit

Permalink
GC Home Page: Reduced Doormats and added all services button
Browse files Browse the repository at this point in the history
  • Loading branch information
BrahimMahadi committed Oct 21, 2024
1 parent c52bfd1 commit 80f992a
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 56 deletions.
20 changes: 20 additions & 0 deletions templates/home/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,26 @@
margin: 1em 0px;
}

// All services button
.all-services-btn {
max-width: 140px;

p {
border: 2px solid #26374a;
border-radius: 5px;
font-weight: bold;
margin-top:20px;

Check failure on line 61 in templates/home/_base.scss

View workflow job for this annotation

GitHub Actions / integration-check (20.x)

Expected `margin-bottom`, found `margin-top`
margin-bottom:20px;

Check failure on line 62 in templates/home/_base.scss

View workflow job for this annotation

GitHub Actions / integration-check (20.x)

Expected `margin-top`, found `margin-bottom`
padding: .75em;
text-align: center;

a {
color:#26374a !important;
text-decoration: none !important;
}
}
}


/* Home page Most requested section
*
Expand Down
38 changes: 10 additions & 28 deletions templates/home/home-en.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
dateModified: 2022-09-16
layout: home
breadcrumbs: false
css:
- test.scss
---

<div class="bg-cover" data-bgimg-srcset="https://www.canada.ca/content/dam/canada/homepage-bg/bkg-home-banner-spring-1920.jpg 1920w, https://www.canada.ca/content/dam/canada/homepage-bg/bkg-home-banner-spring-1200.jpg 1200w, https://www.canada.ca/content/dam/canada/homepage-bg/bkg-home-banner-spring-992.jpg 992w, https://wet-boew.github.io/vocab/wb/utilities#no-image 767w">
Expand Down Expand Up @@ -65,48 +67,28 @@ <h3><a href="https://www.canada.ca/en/services/business.html">Business and indus
<h3><a href="https://www.canada.ca/en/services/benefits.html">Benefits</a></h3>
<p>EI, family and sickness leave, pensions, housing, student aid, disabilities</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/health.html">Health</a></h3>
<p>Food, nutrition, diseases, vaccines, drugs, product safety and recalls</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/taxes.html">Taxes</a></h3>
<p>Income tax, payroll, GST/HST, contribution limits, tax credits, charities</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/environment.html">Environment and natural resources</a></h3>
<p>Weather, climate, agriculture, wildlife, pollution, conservation, fisheries</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/defence.html">National security and defence</a></h3>
<p>Military, transportation and cyber security, securing the border, counter-terrorism</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/culture.html">Culture, history and sport</a></h3>
<p>Arts, media, heritage, official languages, national identity and funding</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/policing.html">Policing, justice and emergencies</a></h3>
<p>Safety, justice system, prepare for emergencies, services for victims of crime</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/transport.html">Transport and infrastructure</a></h3>
<p>Aviation, marine, road, rail, dangerous goods, infrastructure projects</p>
<h3><a href="https://www.canada.ca/en/services/health.html">Health</a></h3>
<p>Food, nutrition, diseases, vaccines, drugs, product safety and recalls</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></h3>
<p>Foreign policy, trade agreements, development work, global issues</p>
<h3><a href="https://www.canada.ca/en/services/environment.html">Environment and natural resources</a></h3>
<p>Weather, climate, agriculture, wildlife, pollution, conservation, fisheries</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/finance.html">Money and finances</a></h3>
<p>Personal finance, credit reports, fraud protection, paying for education</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/en/services/science.html">Science and innovation</a></h3>
<p>Scientific research on health, environment and space, grants and funding</p>
</div>
</div>
<div class="all-services-btn">
<a href="https://www.canada.ca/en/services.html">All services</a>
</div>
</div>

</section>

<section class="home-your-gov well well-bold well-sm brdr-0">
Expand Down
37 changes: 9 additions & 28 deletions templates/home/home-fr.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
dateModified: 2024-09-16
layout: home
breadcrumbs: false
css:
- test.scss
---

<div class="bg-cover" data-bgimg-srcset="https://www.canada.ca/content/dam/canada/homepage-bg/bkg-home-banner-spring-1920.jpg 1920w, https://www.canada.ca/content/dam/canada/homepage-bg/bkg-home-banner-spring-1200.jpg 1200w, https://www.canada.ca/content/dam/canada/homepage-bg/bkg-home-banner-spring-992.jpg 992w, https://wet-boew.github.io/vocab/wb/utilities#no-image 767w">
Expand Down Expand Up @@ -63,46 +65,25 @@ <h3><a href="https://www.canada.ca/fr/services/entreprises.html">Entreprises et
<h3><a href="https://www.canada.ca/fr/services/prestations.html">Prestations</a></h3>
<p>Assurance emploi, congés familiaux et congés de maladie, pensions, logement, aide financière aux études, personnes invalides</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/sante.html">Santé</a></h3>
<p>Alimentation, nutrition, maladies, vaccins, médicaments, sécurité des produits et rappels</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/impots.html">Impôts</a></h3>
<p>Impôt sur le revenu, TPS/TVH, limites de contribution, credits d’impôt, organismes de charité </p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/environnement.html">Environnement et ressources naturelles</a></h3>
<p>Météo, climat, agriculture, faune, pollution, conservation, pêches</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/defense.html">Sécurité nationale et défense</a></h3>
<p>Militaire, cybersécurité, sûreté des transports, sécuriser la frontière, contre-terrorisme</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/culture.html">Culture, histoire et sport</a></h3>
<p>Arts, médias, patrimoine, langues officielles, identité nationale et financement</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences</a></h3>
<p>Sécurité, justice, se préparer en cas d'urgence, services aux victimes d'actes criminels</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure</a></h3>
<p>Aviation, transport maritime, transport routier, transport ferroviaire, marchandises dangereuses, projets d'infrastructure</p>
<h3><a href="https://www.canada.ca/fr/services/sante.html">Santé</a></h3>
<p>Alimentation, nutrition, maladies, vaccins, médicaments, sécurité des produits et rappels</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></h3>
<p>Politique étrangère, ententes commerciales, développement international, enjeux mondiaux</p>
<h3><a href="https://www.canada.ca/fr/services/environnement.html">Environnement et ressources naturelles</a></h3>
<p>Météo, climat, agriculture, faune, pollution, conservation, pêches</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/finance.html">Argent et finances</a></h3>
<p>Finances personnelles, dossiers de crédit, se protéger de la fraude, financer votre éducation</p>
</div>
<div class="col-lg-4 col-md-6">
<h3><a href="https://www.canada.ca/fr/services/science.html">Science et innovation</a></h3>
<p>Recherche scientifique sur la santé, l'environnement et l'espace, subventions et financement</p>
</div>
</div>
<div class="all-services-btn">
<a href="https://www.canada.ca/fr/services.html">Tous les services</a>
</div>
</div>
</section>
Expand Down
17 changes: 17 additions & 0 deletions templates/home/test.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* All services button */
.all-services-btn{
max-width: 140px;

border: 2px solid #26374a;
border-radius: 5px;
font-weight: bold;
margin-top:20px;
margin-bottom:20px;
padding: .75em;
text-align: center;
}

.all-services-btn a {
color:#26374a !important;
text-decoration: none !important;
}

0 comments on commit 80f992a

Please sign in to comment.