Commit 674b4806 authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-5062-m26lebla-footer-text-sizing' into '3.0.x'

ISTWCMS-5062: css for the global footer font sizing, also flex adjustments to...

See merge request !98
parents 1862fe4c b0c67a7d
...@@ -44,10 +44,14 @@ ...@@ -44,10 +44,14 @@
.org-default .uw-footer__social-directory a:hover, .org-default .uw-footer__social-directory a:focus { .org-default .uw-footer__social-directory a:hover, .org-default .uw-footer__social-directory a:focus {
color: #fdd54f; } color: #fdd54f; }
.org-default .uw-territorial a:link, .org-default .uw-territorial a:visited { .org-default .uw-footer-phone a:link, .org-default .uw-footer-phone a:visited,
.org-default .uw-territorial a:link,
.org-default .uw-territorial a:visited {
color: #fdd54f; } color: #fdd54f; }
.org-default .uw-territorial a:hover, .org-default .uw-territorial a:focus { .org-default .uw-footer-phone a:hover, .org-default .uw-footer-phone a:focus,
.org-default .uw-territorial a:hover,
.org-default .uw-territorial a:focus {
color: #fdd54f; } color: #fdd54f; }
.org-default.global-site-footer:visited, .org-default.global-site-footer:active { .org-default.global-site-footer:visited, .org-default.global-site-footer:active {
...@@ -2609,8 +2613,6 @@ input[size="60"] { ...@@ -2609,8 +2613,6 @@ input[size="60"] {
.uw-footer { .uw-footer {
background-color: #000; background-color: #000;
margin-top: 0;
min-height: 3rem;
padding: 0; padding: 0;
width: 100%; } width: 100%; }
.uw-footer__wrapper { .uw-footer__wrapper {
...@@ -2620,68 +2622,83 @@ input[size="60"] { ...@@ -2620,68 +2622,83 @@ input[size="60"] {
padding: 0 16px; padding: 0 16px;
display: grid; display: grid;
grid-template-columns: 100%; grid-template-columns: 100%;
padding: 16px; } padding-top: 16px;
-webkit-text-size-adjust: none;
-moz-text-size-adjust: none;
-ms-text-size-adjust: none;
text-size-adjust: none; }
@media (min-width: 75rem) { @media (min-width: 75rem) {
.uw-footer__wrapper { .uw-footer__wrapper {
padding-left: 0; padding-left: 0;
padding-right: 0; } } padding-right: 0; } }
@media (min-width: 30rem) {
.uw-footer__wrapper {
grid-template-columns: 50% 50%; } }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.uw-footer__wrapper { .uw-footer__wrapper {
grid-template-columns: 28% auto 35%; } } grid-template-columns: 200px auto 14rem; } }
@media (min-width: 63.1875rem) { @media (min-width: 63.1875rem) {
.uw-footer__wrapper { .uw-footer__wrapper {
grid-template-columns: 25% auto 30%; } } grid-template-columns: 246px auto 16rem; } }
.uw-footer__address { .uw-footer__address {
font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif; font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
font-size: 12.64px; font-size: 14.22224px;
grid-column: 1 / 2; -webkit-font-smoothing: antialiased;
grid-column: 1 / 3;
grid-row: 1 / 2; grid-row: 1 / 2;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding-bottom: 16px; } padding: 16px 0 24px;
text-align: center; }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.uw-footer__address { .uw-footer__address {
grid-column: 1 / 3; font-size: 12.64px;
grid-column: 1 / 2;
grid-row: 1 / 2; grid-row: 1 / 2;
margin: 0; } } margin: 0;
padding: 0;
text-align: left; } }
@media (min-width: 63.1875rem) { @media (min-width: 63.1875rem) {
.uw-footer__address { .uw-footer__address {
grid-column: 1 / 2; font-size: 14.22224px; } }
grid-row: 1 / 2; } }
.uw-footer__menu { .uw-footer__menu {
grid-column: 1 / 2; -webkit-font-smoothing: antialiased;
grid-row: 2 / 3; } grid-column: 1 / 3;
@media (min-width: 48.06rem) { padding-bottom: 16px; }
@media (min-width: 30rem) {
.uw-footer__menu { .uw-footer__menu {
grid-column: 2 / 3; grid-column: 1 / 2;
grid-row: 1 / 2; } } grid-row: 2 / 3; } }
@media (min-width: 63.1875rem) { @media (min-width: 48.06rem) {
.uw-footer__menu { .uw-footer__menu {
grid-column: 2 / 3; grid-column: 2 / 3;
grid-row: 1 / 2; } } grid-row: 1 / 2; } }
.uw-footer__social { .uw-footer__social {
grid-column: 1 / 2; grid-column: 1 / 3;
grid-row: 3 / 4; grid-row: 3 / 4;
margin: 0 auto; margin: 0 auto;
margin-top: 1rem; max-width: 13rem;
text-align: center; } text-align: center;
width: 100%; }
@media (min-width: 30rem) {
.uw-footer__social {
grid-column: 2 / 3;
grid-row: 2 / 3; } }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.uw-footer__social { .uw-footer__social {
grid-column: 3 / 4; grid-column: 3 / 4;
grid-row: 1 / 2; grid-row: 1 / 2;
margin: 0; margin: 0;
max-width: 16rem;
padding-left: 16px;
text-align: left; } } text-align: left; } }
@media (min-width: 63.1875rem) {
.uw-footer__social {
grid-column: 3 / 4;
grid-row: 1 / 2; } }
.uw-footer__social-directory { .uw-footer__social-directory {
text-align: center; } text-align: center; }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.uw-footer__social-directory { .uw-footer__social-directory {
text-align: right; } } text-align: right; } }
.uw-footer__social-directory a { .uw-footer__social-directory a {
font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif; font-family: Typ1451-Regular,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
font-size: 12.64px; font-size: 12.64px;
text-decoration: none; } text-decoration: none; }
.uw-footer__social-directory a:hover { .uw-footer__social-directory a:hover {
...@@ -2689,6 +2706,10 @@ input[size="60"] { ...@@ -2689,6 +2706,10 @@ input[size="60"] {
.uw-footer__territorial { .uw-footer__territorial {
grid-column: 1 / 4; grid-column: 1 / 4;
grid-row: 4 / 5; } grid-row: 4 / 5; }
.uw-footer__territorial a {
text-decoration: none; }
.uw-footer__territorial a:hover {
text-decoration: underline; }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.uw-footer__territorial { .uw-footer__territorial {
grid-row: 3 / 4; } } grid-row: 3 / 4; } }
...@@ -7020,11 +7041,7 @@ fieldset, ...@@ -7020,11 +7041,7 @@ fieldset,
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
font-size: 0.702rem;
font-weight: 300;
justify-content: flex-start; justify-content: flex-start;
letter-spacing: 0.045rem;
list-style-type: none; list-style-type: none;
padding-bottom: 1rem; padding-bottom: 1rem;
text-align: center; text-align: center;
...@@ -7041,65 +7058,55 @@ fieldset, ...@@ -7041,65 +7058,55 @@ fieldset,
.menu--uw-footer li:nth-child(1) { .menu--uw-footer li:nth-child(1) {
border-width: 1px 0 0 1px; } border-width: 1px 0 0 1px; }
.menu--uw-footer li:nth-child(2) { .menu--uw-footer li:nth-child(2) {
border-width: 1px 0 0 1px; border-width: 1px 1px 0; }
order: 2; }
.menu--uw-footer li:nth-child(3) { .menu--uw-footer li:nth-child(3) {
border-width: 1px 0 0 1px; border-width: 1px 0 0 1px; }
order: 3; }
.menu--uw-footer li:nth-child(4) { .menu--uw-footer li:nth-child(4) {
border-width: 1px 0 0 1px; border-width: 1px 1px 0; }
order: 4; }
.menu--uw-footer li:nth-child(5) { .menu--uw-footer li:nth-child(5) {
border-width: 1px; border-width: 1px 0 0 1px; }
order: 5; }
.menu--uw-footer li:nth-child(6) { .menu--uw-footer li:nth-child(6) {
border-width: 1px 1px 0; border-width: 1px 1px 0; }
order: 1; }
.menu--uw-footer li:nth-child(7) { .menu--uw-footer li:nth-child(7) {
border-width: 1px 1px 0; border-width: 1px 0 0 1px; }
order: 2; }
.menu--uw-footer li:nth-child(8) { .menu--uw-footer li:nth-child(8) {
border-width: 1px 1px 0; border-width: 1px 1px 0; }
order: 3; }
.menu--uw-footer li:nth-child(9) { .menu--uw-footer li:nth-child(9) {
border-width: 1px 1px 0; border-width: 1px; }
order: 4; }
@media (min-width: 30rem) { @media (min-width: 30rem) {
.menu--uw-footer li { .menu--uw-footer li {
padding: 0.25rem 0 0.25rem 1rem; padding: 0 0 0 0.5rem;
text-align: left; } text-align: left; }
.menu--uw-footer li:nth-child(1) { .menu--uw-footer li:nth-child(1) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 1; }
.menu--uw-footer li:nth-child(2) { .menu--uw-footer li:nth-child(2) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 2; }
.menu--uw-footer li:nth-child(3) { .menu--uw-footer li:nth-child(3) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 3; }
.menu--uw-footer li:nth-child(4) { .menu--uw-footer li:nth-child(4) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 4; }
.menu--uw-footer li:nth-child(5) { .menu--uw-footer li:nth-child(5) {
border-width: 0; border-width: 0 1px 0 0; }
order: 5; }
.menu--uw-footer li:nth-child(6) { .menu--uw-footer li:nth-child(6) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 1; }
.menu--uw-footer li:nth-child(7) { .menu--uw-footer li:nth-child(7) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 2; }
.menu--uw-footer li:nth-child(8) { .menu--uw-footer li:nth-child(8) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; }
order: 3; }
.menu--uw-footer li:nth-child(9) { .menu--uw-footer li:nth-child(9) {
border-width: 0 1px 0 0; border-width: 0 1px 0 0; } }
order: 4; } }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.menu--uw-footer li { .menu--uw-footer li {
flex: 1 0 33%; flex: 1 0 33%;
padding: 0 0 0 1rem; } } padding: 0 0.25rem 0 1rem; }
.menu--uw-footer li:nth-child(1), .menu--uw-footer li:nth-child(4), .menu--uw-footer li:nth-child(7) {
border-width: 0 1px; } }
.menu--uw-footer li a { .menu--uw-footer li a {
display: block;
font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
font-size: 0.88889rem;
font-weight: 300;
line-height: 1.50;
outline: none; outline: none;
text-decoration: none; } text-decoration: none; }
.menu--uw-footer li a:hover { .menu--uw-footer li a:hover {
...@@ -7959,12 +7966,17 @@ fieldset, ...@@ -7959,12 +7966,17 @@ fieldset,
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;
list-style-type: none; list-style-type: none;
margin: 0; margin: 0 auto;
padding: 0; padding: 0;
padding-bottom: 16px; } padding-bottom: 16px; }
@media (min-width: 30rem) {
.social-media-list {
margin: 0;
max-width: inherit; } }
.social-media-list li { .social-media-list li {
flex: 1; flex: 1;
padding-left: 0; } padding-left: 0;
padding-top: 0; }
@media (min-width: 48.06rem) { @media (min-width: 48.06rem) {
.uw-social-media { .uw-social-media {
...@@ -9206,7 +9218,7 @@ html:not(.js) .uw-tabcontent[role="tabpanel"][hidden] { ...@@ -9206,7 +9218,7 @@ html:not(.js) .uw-tabcontent[role="tabpanel"][hidden] {
text-align: center; } text-align: center; }
.uw-territorial p { .uw-territorial p {
color: #fff; color: #fff;
font-family: Typ1451-Medium,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif; font-family: Typ1451-Regular,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
font-size: 0.79rem; font-size: 0.79rem;
font-weight: 200; font-weight: 200;
letter-spacing: 0.5px; letter-spacing: 0.5px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -52,6 +52,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat' ...@@ -52,6 +52,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
color:$uw-gold; color:$uw-gold;
} }
} }
.uw-footer-phone a,
.uw-territorial a{ .uw-territorial a{
&:link, &:link,
&:visited { &:visited {
......
...@@ -40,7 +40,6 @@ $uw-input-padding: 0.46667rem; ...@@ -40,7 +40,6 @@ $uw-input-padding: 0.46667rem;
padding: $uw-input-padding; padding: $uw-input-padding;
transition: border-color; transition: border-color;
width: 100%; width: 100%;
&:focus { &:focus {
border: 1px solid $uw-input-border-color-focus !important; border: 1px solid $uw-input-border-color-focus !important;
box-shadow: inset 0 1px 3px rgba(0,0,0,.06), 0 0 5px rgba(104,104,104,.7); box-shadow: inset 0 1px 3px rgba(0,0,0,.06), 0 0 5px rgba(104,104,104,.7);
......
...@@ -3,77 +3,87 @@ ...@@ -3,77 +3,87 @@
.uw-footer { .uw-footer {
background-color: #000; background-color: #000;
margin-top: 0;
min-height: 3rem;
padding: 0; padding: 0;
width: 100%; width: 100%;
&__wrapper { &__wrapper {
@include uw-contained-width; @include uw-contained-width;
display: grid; display: grid;
grid-template-columns: 100%; grid-template-columns: 100%;
padding: gesso-spacing(sm); padding-top: gesso-spacing(sm);
text-size-adjust: none;
@include xs {
grid-template-columns:50% 50%;
}
@include medium { @include medium {
grid-template-columns: 28% auto 35%; grid-template-columns:200px auto 14rem;
} }
@include large { @include large {
grid-template-columns: 25% auto 30%; grid-template-columns:246px auto 16rem;
} }
} }
&__address { &__address {
font-family: gesso-font-family(systemmedium); font-family: gesso-font-family(systemmedium);
font-size: gesso-font-size(-2); font-size: gesso-font-size(-1);
grid-column: 1 / 2; -webkit-font-smoothing: antialiased;
grid-column: 1 / 3;
grid-row: 1 / 2; grid-row: 1 / 2;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding-bottom: gesso-spacing(sm); padding: gesso-spacing(sm) 0 gesso-spacing(md);
text-align:center;
@include medium { @include medium {
grid-column: 1 / 3; font-size: gesso-font-size(-2);
grid-column: 1 / 2;
grid-row: 1 / 2; grid-row: 1 / 2;
margin:0; margin:0;
padding:0;
text-align:left;
} }
@include large { @include large {
grid-column: 1 / 2; font-size: gesso-font-size(-1);
grid-row: 1 / 2;
} }
} }
&__menu { &__menu {
grid-column: 1 / 2; -webkit-font-smoothing: antialiased;
grid-row: 2 / 3; grid-column: 1 / 3;
padding-bottom: gesso-spacing(sm);
@include medium { @include xs {
grid-column: 2 / 3; grid-column: 1 / 2;
grid-row: 1 / 2; grid-row: 2 / 3;
} }
@include medium {
@include large {
grid-column: 2 / 3; grid-column: 2 / 3;
grid-row: 1 / 2; grid-row: 1 / 2;
} }
} }
&__social { &__social {
grid-column: 1 / 2; //background:$test-color-2;
grid-column: 1 / 3;
grid-row: 3 / 4; grid-row: 3 / 4;
margin:0 auto; margin:0 auto;
margin-top:1rem; max-width:13rem;
text-align: center; text-align: center;
width:100%;
@include xs {
grid-column: 2 / 3;
grid-row: 2 / 3;
}
@include medium { @include medium {
grid-column: 3 / 4; grid-column: 3 / 4;
grid-row: 1 / 2; grid-row: 1 / 2;
margin:0; margin:0;
max-width:16rem;
padding-left:gesso-spacing(sm);
text-align: left; text-align: left;
} }
@include large {
grid-column: 3 / 4;
grid-row: 1 / 2;
}
} }
&__social-directory { &__social-directory {
text-align: center; text-align: center;
@include medium { @include medium {
...@@ -81,7 +91,7 @@ ...@@ -81,7 +91,7 @@
} }
a { a {
font-family: gesso-font-family(systemmedium); font-family: gesso-font-family(system);
font-size: gesso-font-size(-2); font-size: gesso-font-size(-2);
text-decoration: none; text-decoration: none;
} }
...@@ -91,6 +101,12 @@ ...@@ -91,6 +101,12 @@
} }
} }
&__territorial { &__territorial {
a{
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
grid-column: 1 / 4; grid-column: 1 / 4;
grid-row: 4 / 5; grid-row: 4 / 5;
@include medium { @include medium {
......
// @file // @file
// Styles for the footer menu. // Styles for the footer menu.
.menu--uw-footer { .menu--uw-footer {
align-items:flex-start; align-items:flex-start;
display:flex; display:flex;
flex-direction:row; flex-direction:row;
flex-wrap:wrap; flex-wrap:wrap;
font-family: gesso-font-family(condensedbook);
font-size: rem(gesso-font-size(-3));
font-weight:300;
justify-content: flex-start; justify-content: flex-start;
letter-spacing: 0.045rem;
list-style-type: none; list-style-type: none;
padding-bottom: 1rem; padding-bottom: 1rem;
text-align: center; text-align: center;
...@@ -28,85 +23,76 @@ ...@@ -28,85 +23,76 @@
border-width: 1px 0 0 1px; border-width: 1px 0 0 1px;
} }
&:nth-child(2) { &:nth-child(2) {
border-width: 1px 0 0 1px; border-width:1px 1px 0;
order: 2;