Commit b5129686 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.0.x' into prod/1.0.x

parents 30e3db62 3a23c879
......@@ -9,27 +9,27 @@
transition-property: background-color, border-color, color, outline-color, text-decoration-color;
transition-timing-function: var(--ease-in-out-2);
&:where([href]) {
color: var(--gray-6);
text-decoration-color: var(--gray-1);
&:where(:hover) {
color: var(--uw-black);
text-decoration-color: var(--uw-black);
}
&:where(:focus) {
color: var(--uw-black);
text-decoration-color: var(--uw-black);
}
&:where(:visited) {
color: var(--gray-6);
text-decoration-color: var(--gray-6);
}
}
&:where(:not(:hover)) {
text-decoration: inherit;
}
//&:where([href]) {
// color: var(--gray-6);
// text-decoration-color: var(--gray-1);
//
// &:where(:hover) {
// color: var(--uw-black);
// text-decoration-color: var(--uw-black);
// }
// &:where(:focus) {
// color: var(--uw-black);
// text-decoration-color: var(--uw-black);
// }
// &:where(:visited) {
// color: var(--gray-6);
// text-decoration-color: var(--gray-6);
// }
//}
//&:where(:not(:hover)) {
// text-decoration: inherit;
//}
@media print {
&,
......
......@@ -69,10 +69,8 @@
--stp-2: #e41740;
--stp-3: #b71233;
--stp-4: #80001f;
--stp-brown: #584528;
--stp-green: #879637;
--stp-light: #c2cd79;
--stp-primary: #879637;
--stp-light: #3499CC;
--stp-primary: #21698E;
--ren-1: #ffa5aa;
--ren-2: #e41740;
--ren-3: #b71233;
......
......@@ -76,7 +76,7 @@ social_media:
url: "https://www.linkedin.com/edu/school?id=10875"
social_media_placement: "global-site-footer"
modifier_classes: 'black'
territorial_text: '<p>The University of Waterloo acknowledges that much of our work takes place on the traditional territory of the Neutral, Anishinaabeg and Haudenosaunee peoples. Our main campus is situated on the Haldimand Tract, the land granted to the Six Nations that includes six miles on each side of the Grand River. Our active work toward reconciliation takes place across our campuses through research, learning, teaching, and community building, and is centralized within our <a href="https://uwaterloo.ca/indigenous" >Office of Indigenous Relations</a>.</p>'
territorial_text: '<p>The University of Waterloo acknowledges that much of our work takes place on the traditional territory of the Neutral, Anishinaabeg and Haudenosaunee peoples. Our main campus is situated on the Haldimand Tract, the land granted to the Six Nations that includes six miles on each side of the Grand River. Our active work toward reconciliation takes place across our campuses through research, learning, teaching, and community building, and is coordinated within our <a href="https://uwaterloo.ca/indigenous" >Office of Indigenous Relations</a>.</p>'
is_demo_footer: true
cookie:
text: '<h2>We use cookies on this site to enhance the user experience.</h2><p>Select "Accept all" to agree and continue. You consent to our cookies if you continue to use this website.</p>'
......@@ -18,16 +18,6 @@
}
&__title {
color: var(--uw-white-1);
a{
color: var(--uw-white-1);
text-decoration: underline;
&:hover,
&:focus
{
color: var(--uw-white-1);
text-decoration: none;
}
}
//font-family: gesso-font-family(condensedbook);
//font-size: rem(gesso-font-size(3));
grid-column: 1 / 2;
......
......@@ -28,6 +28,7 @@
@forward 'icon/icon--button/icon--button';
@forward 'image/image';
@forward 'image-gallery/image-gallery';
@forward 'links/links';
@forward 'mailchimp/mailchimp';
@forward 'mailman-subscription/mailman-subscription';
@forward 'menu/menu';
......
......@@ -53,7 +53,7 @@
.uw-cta__text--medium,
a {
color: var(--#{$colour}-primary);
filter: brightness(0.95);
filter: brightness(0.2);
}
}
......
......@@ -125,13 +125,6 @@ $card-padding: var(--size-2) !default;
margin: 0 0 var(--size-1) 0;
padding: 0;
width: 100%;
a {
@include link-reverse(
var(--uw-black-primary),
var(--uw-black-primary)
);
}
}
.card__author {
......@@ -140,13 +133,6 @@ $card-padding: var(--size-2) !default;
font-size: var(--font-size-00);
margin-top: 0;
padding: 0 0 var(--size-1) 0;
a {
@include link(
var(--uw-black-primary),
var(--uw-black-primary)
);
}
}
// body
......
......@@ -226,7 +226,6 @@
}
.card__banner--image {
background: var(--uw-black);
margin-bottom: 0;
padding: 0;
position: relative;
......@@ -281,29 +280,29 @@
margin: 0;
}
a {
background: var(--uw-black);
.card__banner--media {
margin-bottom: 0;
opacity: 1;
order: inherit;
transition-delay: 0s;
transition-duration: 0.2s;
transition-property: color, background-color, border-color, opacity;
transition-property: color, border-color, filter;
transition-timing-function: linear;
}
&:hover {
.card__banner--media {
opacity: 0.6;
filter: brightness(50%);
transition-delay: 0s;
transition-duration: 0.2s;
transition-property: color, background-color, border-color, opacity;
transition-property: color, border-color, filter;
transition-timing-function: linear;
}
}
}
.uw-picture__fallback{
background: var(--uw-black);
//background: var(--uw-black);
display: block;
}
}
......
......@@ -24,44 +24,42 @@
}
}
}
.form--inline{
.form-item.form-wrapper {
background: var(--uw-white);
margin: 0;
.form-item.form-wrapper {
background: var(--uw-white);
margin: 0;
.form-item{
float: inherit;
.form-item{
float: inherit;
.form-item{
margin: 0;
}
margin: 0;
}
}
details{
&.uw-details,
&.seven-details{
background: var(--uw-white);
border: var(--size-xs) solid var(--gray-3);
border-width: var(--size-xs) var(--size-xs) 0 var(--size-xs);
font-family: var(--font-systembold);
font-size: var(--font-size-000);
margin: 0;
&[open] > .seven-details__summary {
background-color: var(--gray-2);
color: var(--uw-black-primary);
}
&:hover > .seven-details__summary {
background-color: var(--gray-2);
color: var(--uw-black-primary);
}
&:last-of-type{
border-width: var(--size-xs);
margin-bottom: var(--size-1);
}
}
details{
&.uw-details,
&.seven-details{
background: var(--uw-white);
border: var(--size-xs) solid var(--gray-3);
border-width: var(--size-xs) var(--size-xs) 0 var(--size-xs);
font-family: var(--font-systembold);
font-size: var(--font-size-000);
margin: 0;
&[open] > .seven-details__summary {
background-color: var(--gray-2);
color: var(--uw-black-primary);
}
&:hover > .seven-details__summary {
background-color: var(--gray-2);
color: var(--uw-black-primary);
}
summary{
&.seven-details__summary,
&.details__summary {
background-color: var(--uw-white);
}
&:last-of-type{
border-width: var(--size-xs);
margin-bottom: var(--size-1);
}
}
summary{
&.seven-details__summary,
&.details__summary {
background-color: var(--uw-white);
}
}
}
......
......@@ -5,7 +5,7 @@
.catalog-search-form,
.service-search-form,
.uw-project-search-form {
.uw-project-search-form{
display: grid;
grid-template-columns: auto var(--size-6);
padding: 0;
......
@use '../../01-core' as *;
@each $faculty, $colour in $faculties_colours {
.#{$faculty} {
// If the UW branding group
@if $faculty == org-default {
// Generic links
a {
@include link(
var(--uw-black),
var(--gray-5)
);
&.button {
@include link-no-underline(
var(--uw-white),
var(--gray-5)
);
}
&.uw-site-name__link {
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
&.tag {
@include link-reverse(
var(--gray-5),
var(--gray-5)
);
}
}
.card__title a{
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
.menu--uw-footer li a{
@include link-reverse(
var(--uw-white),
var(--uw-gold)
);
}
.uw-site-footer__content a,
.uw-site-footer__title a{
@include link(
var(--uw-white),
var(--uw-white)
);
}
.uw-site-footer__content table a{
@include link(
var(--uw-black),
var(--uw-black)
);
}
.uw-site-footer__social-media a {
@include link(
var(--uw-gray),
var(--uw-gray)
);
}
.uw-footer__social-directory a{
@include link-reverse(
var(--uw-gold),
var(--uw-white)
);
}
.views-exposed-form a,
.uw-site-name__link,
.layout-builder__link,
.tabs a,
.timeline-info__withlink a,
.ui-dialog-content a,
.messages--status a,
.uw-content-moderation a,
.view-interact a{
@include link-no-underline(
var(--uw-black),
var(--uw-black)
);
}
.toolbar-tray a{
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
.uw-footer-phone a,
.uw-territorial a{
@include link-reverse(
var(--uw-gold),
var(--uw-gold)
);
}
.tabs a{
@include link-no-underline(
var(--uw-black),
var(--uw-black)
);
}
.pager__item a{
&:hover,
&:focus{
color: var(--uw-black) !important;
}
}
.uw-site-footer__content .highlight{
color: var(--uw-white);
}
}
// Else run the loop on the faculties.
@else {
// Generic links.
a{
@include link(
var(--#{$colour}-primary),
var(--#{$colour}-primary)
);
// Links as buttons need white.
&.button {
@include link-no-underline(
var(--uw-white),
var(--gray-5)
);
}
&.pager__link {
color: var(--uw-black);
}
&.uw-site-name__link {
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
&.tag {
@include link-reverse(
var(--#{$colour}-primary),
var(--#{$colour}-primary)
);
}
}
.card__title a{
@include link-reverse(
var(--#{$colour}-primary),
var(--#{$colour}-primary)
);
}
.menu--uw-footer li a{
@include link-reverse(
var(--uw-white),
var(--uw-gold)
);
}
.uw-site-footer__content a,
.uw-site-footer__title a{
@include link(
var(--uw-white),
var(--uw-white)
);
}
.uw-site-footer__content table a{
@include link(
var(--uw-black),
var(--uw-black)
);
}
.uw-site-footer__social-media a {
@include link(
var(--gray-5),
var(--gray-5)
);
}
.uw-footer__social-directory a{
@include link-reverse(
var(--uw-gold),
var(--uw-white)
);
}
.uw-footer-phone a,
.uw-territorial a{
@include link-reverse(
var(--uw-gold),
var(--uw-gold)
);
}
// Blackout the link
.views-exposed-form a,
.uw-site-name__link,
.layout-builder__link,
.tabs a,
.timeline-info__withlink a,
.ui-dialog-content a,
.messages--status a,
.uw-content-moderation a,
.view-interact a{
@include link-no-underline(
var(--uw-black),
var(--uw-black)
);
}
.toolbar-tray a{
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
.uw-site-footer__content .highlight{
color: var(--uw-white);
}
// MAke primary color.
.uw-blockquote__text,
.uw-blockquote__text::before,
.uw-blockquote__text::after,
.uw-blockquote__attribution,
.uw-blockquote__attribution cite{
color: var(--#{$colour}-primary);
}
}
}
}
......@@ -6,13 +6,6 @@ $site-name-font-size: var(--font-size-5);
$site-slogan-font-size: var(--font-size-2);
.uw-site-name {
a {
color: var(--uw-black);
&:hover{
text-decoration: underline;
}
}
&__wrapper {
padding: 0 var(--size-1);
@media(min-width: $screen-md) {
......@@ -23,7 +16,6 @@ $site-slogan-font-size: var(--font-size-2);
&__link {
display: inline-block;
letter-spacing: inherit;
text-decoration: none;
text-transform: uppercase;
}
......
<div class="uw-bg--{{ modifier_classes }}">
<div class="uw-territorial">
<p>The University of Waterloo acknowledges that much of our work takes place on the traditional territory of the Neutral, Anishinaabeg and Haudenosaunee peoples. Our main campus is situated on the Haldimand Tract, the land granted to the Six Nations that includes six miles on each side of the Grand River. Our active work toward reconciliation takes place across our campuses through research, learning, teaching, and community building, and is centralized within our <a href="https://uwaterloo.ca/indigenous" >Office of Indigenous Relations</a>.</p>
<p>The University of Waterloo acknowledges that much of our work takes place on the traditional territory of the Neutral, Anishinaabeg and Haudenosaunee peoples. Our main campus is situated on the Haldimand Tract, the land granted to the Six Nations that includes six miles on each side of the Grand River. Our active work toward reconciliation takes place across our campuses through research, learning, teaching, and community building, and is coordinated within our <a href="https://uwaterloo.ca/indigenous" >Office of Indigenous Relations</a>.</p>
</div>
</div>
......@@ -2,7 +2,7 @@
.vertical-timeline {
font-family: var(--font-secondary);
font-size: var(--font-size-1);
font-size: var(--font-size-00);
font-weight: 200;
list-style: none;
/* 2 padding-top to allow pulling the line up above the first entry */
......@@ -24,17 +24,17 @@
@media(min-width: $screen-md) {
margin: 0;
}
p {
font-family: var(--font-secondary);
font-size: var(--font-size-1);
p{
margin-top: var(--size-1);
}
a {
text-decoration: none;
p,
ul,
ol,
{
font-family: var(--font-secondary);
font-size: var(--font-size-00);
}
li {
margin: 0;
padding: 0;
......
......@@ -24,6 +24,20 @@ $sidebar-width: 18.75rem;
}
}
}
&s-projects-container{
margin-left: auto;
margin-right: auto;
max-width: var(--layout-max-width);
padding: 0 var(--size-2);
position: relative;
width: 100%;
@media(min-width: $screen-xl) {
padding: 0;
}
.views-element-container{
padding: 0;
}
}
display: block;
padding: 0;
position: relative;
......@@ -84,6 +98,9 @@ $sidebar-width: 18.75rem;
width: 100%;
}
.view-filters {
.views-projects-container &{
margin-top: var(--size-9);
}
h2{
margin-top: 0;
}
......@@ -206,6 +223,7 @@ $sidebar-width: 18.75rem;
.view-uw-view-news-items,
.view-uw-view-blogs,
.view-uw-view-events,
.view-uw-view-projects,
.path-taxonomy,
.path-projects,
.path-profiles,
......@@ -229,7 +247,8 @@ $sidebar-width: 18.75rem;
}
.path-news,
.path-blog,
.path-events{
.path-events,
.path-projects{