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

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

parents 275b3ff9 6c3a08e3
This diff is collapsed.
......@@ -503,4 +503,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
);
\ No newline at end of file
);
......@@ -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/human-rights-equity-inclusion/indigenous-initiatives" >Indigenous Initiatives Office</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 centralized 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>'
......@@ -64,12 +64,17 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
text-align: center;
width: 100%;
z-index: gesso-z-index(overlay);
h2 {
margin: 0;
.card__title {
font-family: $header-font-family;
font-size: gesso-font-size(6);
line-height: 1.25;
margin:0;
}
.sub-title {
font-family: $header-font-family;
font-family:gesso-font-family(book);
font-size: gesso-font-size(0);
line-height:1;
}
}
......
......@@ -6,7 +6,6 @@
card_type: 'banner',
title: image.big_text,
sub_title: image.small_text,
header_level: 2,
url: image.link,
} %}
{% endfor %}
......@@ -27,7 +27,12 @@
{% endif %}
{% if show_title == 'yes' %}
<h{{ header_level }} class="card__title">
{% if header_level %}
<h{{ header_level }} class="card__title">
{% else %}
<div class="card__title">
<strong>
{% endif %}
{% if url %}
<a href="{{ url }}">
{% endif %}
......@@ -35,7 +40,13 @@
{% if url %}
</a>
{% endif %}
</h{{ header_level }}>
</strong>
{% if header_level %}
</h{{ header_level }}>
{% else %}
</div>
{% endif%}
{% if sub_title %}
<span class="sub-title">{{ sub_title }}</span>
{% endif %}
......
......@@ -6,7 +6,9 @@
padding:0;
position: relative;
.form-item{
margin:0;
.description{
margin:gesso-spacing(xs) 0;
}
}
.form-text {
border-bottom-right-radius: 0;
......@@ -26,6 +28,7 @@
border-bottom-right-radius: 3px;
border-top-left-radius: 0;
border-top-right-radius: 3px;
height:2.39rem;
margin:0;
max-width:inherit;
padding:0;
......
......@@ -4,8 +4,9 @@
<form class="catalog-search-form" data-drupal-selector="catalog-search-all-form" action="/catalogs" method="post" id="catalog-search-form" accept-charset="UTF-8" data-drupal-form-fields="edit-search-input,edit-submit">
<div class="js-form-item form-item js-form-type-textfield form-type-textfield js-form-item-search-input form-item-search-input form-no-label">
<input data-drupal-selector="edit-search-input" type="text" id="edit-search-input" name="search_input" value="" size="60" maxlength="128" placeholder="Search within all catalogs" class="form-text required" required="required" aria-required="true">
</div>
<input aria-label="search" class="catalog-search-submit button js-form-submit form-submit" data-drupal-selector="edit-submit" type="submit" id="edit-submit" name="op" value="">
<input aria-label="search" class="catalog-search-submit button js-form-submit form-submit" data-drupal-selector="edit-submit" type="submit" id="edit-submit" name="op" value="">
<input autocomplete="off" data-drupal-selector="form-sxccibplaegc-73-lec694bsvanum6b-j-wflacshoi" type="hidden" name="form_build_id" value="form-sxCCiBplaegC_73_LEC694bSvAnuM6B-j-wFlACShOI">
<input data-drupal-selector="edit-catalog-search-all-form-form-token" type="hidden" name="form_token" value="ZwUmrQqVQLNwYel4ZKfXoIqHlDdO3R2L2wIyZNBPVPM">
<input data-drupal-selector="edit-catalog-search-all-form" type="hidden" name="form_id" value="catalog_search_all_form">
......
......@@ -12,7 +12,7 @@
{% include '@components/responsive-image/responsive-image.twig' with {
'sources': image.image.sources,
'img_element': image.image.img_element['#uri'],
'alt': 'some alt'
'alt': image.image.alt
} %}
</div>
{% if image.caption %}
......
......@@ -215,14 +215,20 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
border:1px solid $menu-horizontal-bg;
border-radius:50%;
display:block;
height:2rem;
height:1.6rem;
outline:none;
width:2rem;
overflow:hidden;
position:relative;
width:1.6rem;
svg{
height:2rem;
padding-left:gesso-spacing(xxs);
padding-top:gesso-spacing(xxs);
width:2rem;
height:1.9rem;
//padding-left:gesso-spacing(xxs);
//padding-top:gesso-spacing(xxs);
left:5px;
position:absolute;
top:2px;
width:1.9rem;
}
}
}
......
......@@ -2,7 +2,7 @@
<div class="uw-horizontal-nav--wrapper">
<div class="uw-horizontal-nav--home">
<a href="{{ home_link }}" class="uw-site-home__link">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M21 13v10h-6v-6h-6v6h-6v-10h-3l12-12 12 12h-3zm-1-5.907v-5.093h-3v2.093l3 3z"/></svg>
{{ source('@components/svg/icons/_home.svg') }}
<span class="off-screen">Home</span>
</a>
</div>
......
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<path d="M10.982,5.04a.384.384,0,0,0-.375-.4H9.481a.384.384,0,0,0-.375.4V6.187L7.367,4.621a.479.479,0,0,0-.638,0L.9,9.818l.638.837L2.389,9.9v6.479a.384.384,0,0,0,.375.4h2.9a.384.384,0,0,0,.375-.4V13h2v3.375a.384.384,0,0,0,.375.4h2.9a.384.384,0,0,0,.375-.4V9.9l.851.756.638-.837-2.2-1.957Z"/>
</svg>
<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/human-rights-equity-inclusion/indigenous-initiatives" >Indigenous Initiatives Office</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 centralized within our <a href="https://uwaterloo.ca/indigenous" >Office of Indigenous Relations</a>.</p>
</div>
</div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment