From ad3ce866bb45f56e85d48555830ca49625c61ed3 Mon Sep 17 00:00:00 2001
From: m26lebla <m26lebla@uwaterloo.ca>
Date: Fri, 19 Feb 2021 12:22:07 -0500
Subject: [PATCH] css for the footer as well as logic in twig for site footer
name
---
css/styles.css | 23 +++++++++++++---
.../03-layouts/site-footer/_site-footer.scss | 27 +++++++++++++++++++
.../03-layouts/site-footer/site-footer.twig | 9 +++++++
.../03-layouts/site-footer/site-footer.yml | 3 ++-
.../contact-info/_contact-info.scss | 1 -
.../menu/menu--footer/_menu--footer.scss | 1 -
6 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/css/styles.css b/css/styles.css
index 93ae4224..55a9db55 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -2008,7 +2008,9 @@ svg:not(:root) {
@media (min-width: 48.06rem) {
.uw-node.uw-node__with-sidebar .uw-node__grid {
flex-direction: row;
- gap: 1rem; }
+ gap: 1rem;
+ /* Match the width of WCMS2's narrow: 496px */
+ /* Match the width of WCMS2's wide: 753px */ }
.uw-node.uw-node__with-sidebar .uw-node__grid .layout {
width: clamp(320px, 875px, calc(100vw - 333px)); }
.uw-node.uw-node__with-sidebar .uw-node__grid .uw-contained-width {
@@ -2143,6 +2145,23 @@ svg:not(:root) {
@media (min-width: 75rem) {
.uw-site-footer__wrapper {
padding: 16px 0; } }
+ .uw-site-footer__title {
+ font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
+ font-size: 1.424rem;
+ grid-column: 1 / 2;
+ grid-row: 1 / 2;
+ padding-bottom: 16px;
+ text-align: center;
+ text-transform: uppercase; }
+ .uw-site-footer__title a {
+ color: #fff;
+ text-decoration: underline; }
+ .uw-site-footer__title a:hover, .uw-site-footer__title a:focus {
+ text-decoration: none; }
+ @media (min-width: 48.06rem) {
+ .uw-site-footer__title {
+ grid-row: 1 / 2;
+ text-align: left; } }
.uw-site-footer__logo {
grid-column: 1 / 2;
grid-row: 1 / 2;
@@ -3213,7 +3232,6 @@ button {
height: 1.125rem; } }
.uw-footer-address {
- background-color: #000;
color: #fff; }
.uw-footer-address .uw-footer-phone a {
color: #fdd54f;
@@ -4298,7 +4316,6 @@ fieldset,
font-size: 1rem; }
.menu--uw-footer {
- background-color: #000;
display: grid;
font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
font-size: 0.702rem;
diff --git a/source/_patterns/03-layouts/site-footer/_site-footer.scss b/source/_patterns/03-layouts/site-footer/_site-footer.scss
index c1b59e8e..0ac965fc 100644
--- a/source/_patterns/03-layouts/site-footer/_site-footer.scss
+++ b/source/_patterns/03-layouts/site-footer/_site-footer.scss
@@ -1,5 +1,6 @@
.uw-site-footer {
background-color: $uw-local-site-footer-background-color;
+
&__wrapper {
@include uw-contained-width();
display: grid;
@@ -17,7 +18,33 @@
padding:gesso-spacing(sm) 0;
}
}
+ &__title {
+ a{
+ color:#fff;
+ text-decoration:underline;
+
+
+ &:hover,
+ &:focus
+ {
+ text-decoration:none;
+
+ }
+ }
+ font-family: gesso-font-family(condensedbook);
+ font-size: rem(gesso-font-size(3));
+ grid-column: 1 / 2;
+ grid-row: 1 / 2;
+ padding-bottom: gesso-spacing(sm);
+ text-align: center;
+ text-transform:uppercase;
+ @include medium {
+ grid-row: 1 / 2;
+ text-align: left;
+
+ }
+ }
&__logo {
grid-column: 1 / 2;
grid-row: 1 / 2;
diff --git a/source/_patterns/03-layouts/site-footer/site-footer.twig b/source/_patterns/03-layouts/site-footer/site-footer.twig
index bb2b01ce..06982831 100644
--- a/source/_patterns/03-layouts/site-footer/site-footer.twig
+++ b/source/_patterns/03-layouts/site-footer/site-footer.twig
@@ -1,10 +1,19 @@
<div class="uw-site-footer">
<div class="uw-site-footer__wrapper">
+
+ {% if logo_url %}
<div class="uw-site-footer__logo">
<a href="{{ logo_link }}">
<img src="{{ logo_url }}" alt="{{ logo_alt_text }}" />
</a>
</div>
+ {% else %}
+ <div class="uw-site-footer__title">
+ <a href="{{ logo_link }}">
+ {{ site_name }}
+ </a>
+ </div>
+ {% endif %}
<div class="uw-site-footer__social-media">
{% include "@components/menu/menu--social/menu--social.twig" with {
social_media_placement: 'local-site-footer',
diff --git a/source/_patterns/03-layouts/site-footer/site-footer.yml b/source/_patterns/03-layouts/site-footer/site-footer.yml
index 433d85c8..96b1ebbd 100644
--- a/source/_patterns/03-layouts/site-footer/site-footer.yml
+++ b/source/_patterns/03-layouts/site-footer/site-footer.yml
@@ -1,8 +1,9 @@
body: "The standard Lorem Ipsum passage, used since the 1500s<br /><br />Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
site_name: "Faculty of Environment"
-logo_link: "https://www.wlu.ca/"
+logo_link: "https://uwaterloo.ca"
logo_url: "/uw_wcms_gesso/source/images/logos/uwaterloo-logo.svg"
logo_alt_text: "Faculty of Health logo"
+home_link : "#"
facebook: "https://www.facebook.com/University.Waterloo"
social_media:
menu_tree:
diff --git a/source/_patterns/04-components/contact-info/_contact-info.scss b/source/_patterns/04-components/contact-info/_contact-info.scss
index 9ec2733d..5129e471 100644
--- a/source/_patterns/04-components/contact-info/_contact-info.scss
+++ b/source/_patterns/04-components/contact-info/_contact-info.scss
@@ -1,5 +1,4 @@
.uw-footer-address {
- background-color: #000;
color: #fff;
.uw-footer-phone {
diff --git a/source/_patterns/04-components/menu/menu--footer/_menu--footer.scss b/source/_patterns/04-components/menu/menu--footer/_menu--footer.scss
index 345c7b55..f1468852 100644
--- a/source/_patterns/04-components/menu/menu--footer/_menu--footer.scss
+++ b/source/_patterns/04-components/menu/menu--footer/_menu--footer.scss
@@ -2,7 +2,6 @@
// Styles for the footer menu.
.menu--uw-footer {
- background-color: #000;
display: grid;
font-family: gesso-font-family(condensedbook);
font-size: rem(gesso-font-size(-3));
--
GitLab