Skip to content
GitLab
Commit 829274c9 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents caa7dae5 71498d20
Expand all Hide whitespace changes
Inline Side-by-side
build_gesso.sh
View file @ 829274c9
......@@ -2,7 +2,7 @@ env_option=${1:-1}
build_option=${2:-1}
HTML_PATH=${3:-"/var/www/html"}
DRUPAL_PATH=${4:-/var/www/drupal8}
gesso_version="8.x-3.2-uw_wcms1"
gesso_version="8.x-3.2-uw_wcms2"
if [[ -L "$HTML_PATH/uw_wcms_gesso" ]]; then
echo ""
......
core/drupal.init.js
View file @ 829274c9
/**
* @file
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* https://www.drupal.org/node/2815083.
* @preserve
**/
......@@ -15,7 +16,8 @@ document.documentElement.className += ' js';
var domReady = function domReady(callback) {
if (document.readyState !== 'loading') {
callback();
} else {
}
else {
var listener = function listener() {
callback();
document.removeEventListener('DOMContentLoaded', listener);
......
core/drupal.js
View file @ 829274c9
/**
* @file
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* https://www.drupal.org/node/2815083.
* @preserve
**/
......@@ -23,7 +24,8 @@ window.Drupal = { behaviors: {}, locale: {} };
if (typeof behaviors[i].attach === 'function') {
try {
behaviors[i].attach(context, settings);
} catch (e) {
}
catch (e) {
Drupal.throwError(e);
}
}
......@@ -40,7 +42,8 @@ window.Drupal = { behaviors: {}, locale: {} };
if (typeof behaviors[i].detach === 'function') {
try {
behaviors[i].detach(context, settings, trigger);
} catch (e) {
}
catch (e) {
Drupal.throwError(e);
}
}
......@@ -126,7 +129,9 @@ window.Drupal = { behaviors: {}, locale: {} };
try {
url = decodeURIComponent(url);
} catch (e) {}
}
catch (e) {
}
urlParsingNode.setAttribute('href', url);
......@@ -144,10 +149,14 @@ window.Drupal = { behaviors: {}, locale: {} };
try {
absoluteUrl = decodeURIComponent(absoluteUrl);
} catch (e) {}
}
catch (e) {
}
try {
baseUrl = decodeURIComponent(baseUrl);
} catch (e) {}
}
catch (e) {
}
return absoluteUrl === baseUrl || absoluteUrl.indexOf(baseUrl + '/') === 0;
};
......@@ -162,7 +171,8 @@ window.Drupal = { behaviors: {}, locale: {} };
if (typeof drupalTranslations !== 'undefined' && drupalTranslations.pluralFormula) {
index = count in drupalTranslations.pluralFormula ? drupalTranslations.pluralFormula[count] : drupalTranslations.pluralFormula.default;
} else if (args['@count'] !== 1) {
}
else if (args['@count'] !== 1) {
index = 1;
}
......
core/drupalSettingsLoader.js
View file @ 829274c9
/**
* @file
* DO NOT EDIT THIS FILE.
* See the following change record for more information,
* https://www.drupal.org/node/2815083
* https://www.drupal.org/node/2815083.
* @preserve
**/
......
css/styles.css
View file @ 829274c9
This diff is collapsed.
css/styles.min.css
View file @ 829274c9
This source diff could not be displayed because it is too large. You can view the blob instead.
js/component_scripts.min.js
View file @ 829274c9
/**
* @file
* Ckeditor Modal.
*/
(function ($, Drupal) {
if ($.ui && $.ui.dialog) {
orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
$.ui.dialog.prototype._allowInteraction = function (event) {
if ($(event.target).closest('.cke_dialog').length) {
return true;
}
return orig_allowInteraction.apply(this, arguments);
};
}
})(jQuery, Drupal);
/**
* @file
*/
......@@ -186,6 +169,22 @@
};
})(jQuery, Drupal);
/**
* @file
*/
(function ($, Drupal) {
Drupal.behaviors.filtersopen = {
attach: function (context, settings) {
$(document).ready(function () {
$('.view-filters details').each(function () {
$(this).attr("open", "");
});
});
}
};
})(jQuery, Drupal);
/**
* @file
*/
......@@ -311,6 +310,34 @@ else if (e.keyCode === 37) {
};
})(jQuery, Drupal);
/**
* @file
*/
(function ($, Drupal) {
Drupal.behaviors.tabs = {
attach: function (context, settings) {
$(document).ready(function () {
$('.uw-contact-expand-all').click(function () {
$('.uw-contact details').each(function () {
console.log($(this));
$(this).attr("open", "");
});
});
$('.uw-contact-collapse-all').click(function () {
$('.uw-contact details').each(function () {
console.log($(this));
$(this).removeAttr("open");
});
});
});
}
};
})(jQuery, Drupal);
/**
* @file
*/
......@@ -346,6 +373,23 @@ else {
};
})(jQuery);
/**
* @file
* Ckeditor Modal.
*/
(function ($, Drupal) {
if ($.ui && $.ui.dialog) {
orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
$.ui.dialog.prototype._allowInteraction = function (event) {
if ($(event.target).closest('.cke_dialog').length) {
return true;
}
return orig_allowInteraction.apply(this, arguments);
};
}
})(jQuery, Drupal);
/**
* @file
*/
......@@ -601,20 +645,20 @@ else {
*/
(function ($, Drupal) {
Drupal.behaviors.viewcontact = {
Drupal.behaviors.uwexpcolall = {
attach: function (context, settings) {
$(document).ready(function () {
$('.uw-contact-expand-all').click(function () {
$('.uw-contact details').each(function () {
console.log($(this));
$('.uw-exp-col-expand-all').click(function () {
var uuid = $(this).attr('data-uuid');
$('[data-uuid="' + uuid + '"] details').each(function () {
$(this).attr("open", "");
});
});
$('.uw-contact-collapse-all').click(function () {
$('.uw-contact details').each(function () {
console.log($(this));
$('.uw-exp-col-collapse-all').click(function () {
var uuid = $(this).attr('data-uuid');
$('[data-uuid="' + uuid + '"] details').each(function () {
$(this).removeAttr("open");
});
});
......
source/_patterns/02-base/date-formats/_date-formats.scss
View file @ 829274c9
......@@ -12,9 +12,9 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
.uw-field--name-field-uw-blog-date,
.uw-field--name-field-uw-event-date,
.uw-field--name-field-uw-news-date{
background-color:gesso-brand(org-default,uw-black,'primary');
background-color: gesso-brand(org-default, uw-gold, 'primary');
clear: both;
color: gesso-brand(org-default,uw-gold,'primary');
color: gesso-brand(org-default, uw-black, 'primary');
display:inline-block;
font-family: gesso-font-family(systemmedium);
font-size: gesso-font-size(-1);
......@@ -36,8 +36,8 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
.uw-field--name-field-uw-event-date time,
.uw-field--name-field-uw-news-date time{
@if $faculty == org-default {
background-color:gesso-brand(org-default,uw-black,'primary');
color: gesso-brand(org-default,uw-gold,'primary');
background-color: gesso-brand(org-default, uw-gold, 'primary');
color: gesso-brand(org-default, uw-black, 'primary');
}
@else {
......
source/_patterns/03-layouts/content/_content.scss
View file @ 829274c9
......@@ -2,3 +2,8 @@
// Styles for Content Layout.
// .l-content {}
.uw-main{
&.layout.uw-contained-width{
padding:0 0 1rem
}
}
source/_patterns/03-layouts/media/media.twig
View file @ 829274c9
<div class="uw-media {{ modifier_classes }}">
<div class="uw-media {{ modifier_classes }}" {{ attributes }}>
{% block content %}
{% if media %}
<div class="uw-media__object">{{ media }}</div>
......
source/_patterns/03-layouts/ofis/ofis.twig
View file @ 829274c9
......@@ -89,21 +89,23 @@
{% endfor %}
</ul>
{% endif %}
<h2>Graduate studies</h2>
<ul>
{% if ofis_data.personal.accepting_grad_students %}
<li>Currently considering applications from graduate students. A completed online application is
required
for admission; <a
href="https://uwaterloo.ca/graduate-studies-postdoctoral-affairs/future-students/applying-graduate-school/before-you-apply">
start the application process now.</a>
</li>
{% else %}
<li>Not currently accepting applications for graduate students</li>
{% endif %}
{% if ofis_data.personal.adds_status %}
<li>Has <a href="https://uwaterloo.ca/engineering/approved-doctoral-dissertation-supervisor-status">Approved
Doctoral Dissertation Supervisor</a> (ADDS) status
</li>
{% endif %}
</ul>
{% if ofis_data.personal.accepting_grad_students is defined %}
<h2>Graduate studies</h2>
<ul>
{% if ofis_data.personal.accepting_grad_students %}
<li>Currently considering applications from graduate students. A completed online application is
required
for admission; <a
href="https://uwaterloo.ca/graduate-studies-postdoctoral-affairs/future-students/applying-graduate-school/before-you-apply">
start the application process now.</a>
</li>
{% else %}
<li>Not currently accepting applications for graduate students</li>
{% endif %}
{% if ofis_data.personal.adds_status %}
<li>Has <a href="https://uwaterloo.ca/engineering/approved-doctoral-dissertation-supervisor-status">Approved
Doctoral Dissertation Supervisor</a> (ADDS) status
</li>
{% endif %}
</ul>
{% endif %}
source/_patterns/04-components/button/_button.scss
View file @ 829274c9
......@@ -44,15 +44,6 @@
padding:rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs));
}
}
.button--icon{
font-size: rem(gesso-font-size(-3));
max-width: 5rem;
padding:rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs));
&:hover,
&:focus {
padding:rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs));
}
}
// Drupal outputs this class on buttons that can delete content.
.button--primary {
......
source/_patterns/04-components/button/button.twig
View file @ 829274c9
......@@ -64,7 +64,9 @@
{{ text }}
</button>
{% else %}
<a href="{{ url }}" class="button {{ modifier_classes }}">{{ text }}</a>
<a {% if aria %} aria-{{ aria_type_name }}="{{ aria_type_value}}" {% endif %} {% if data_type_name %} data-{{ data_type_name }}="{{ data_type_value }}"{% endif %} {% if btn_id %} id="{{ btn_id }}" {% endif %} class="button {{ modifier_classes }}" href="{{ url }}" {% if btnclick %} onclick="{{ btnclick }}" {% endif %} {% if target %}target="{{ target }}" {% endif %}>
{{ text }}
</a>
{% endif %}
{% if is_demo %}
......
source/_patterns/04-components/card/_card.scss
View file @ 829274c9
......@@ -76,9 +76,6 @@ $card-padding: rem(gesso-spacing(sm)) !default;
);
}
}
// body
.card__body {
@include uw-flex-grid();
......@@ -95,7 +92,6 @@ $card-padding: rem(gesso-spacing(sm)) !default;
margin-bottom: rem(gesso-spacing(md));
width: 100%;
}
.card__media {
//background:$test-color-4;
margin-bottom: rem(gesso-spacing(md));
......@@ -129,7 +125,6 @@ $card-padding: rem(gesso-spacing(sm)) !default;
}
// footer
.card__footer {
//background:$test-color-12;
margin-top: auto;
padding: rem(gesso-spacing(md));
width: 100%;
......
source/_patterns/04-components/card/card--node/_card--node.scss
View file @ 829274c9
......@@ -21,11 +21,12 @@
.card__body {
background:gesso-brand(org-default,uw-white,primary);
}
.card__header {
@include uw-contained-width;
background:gesso-brand(org-default,uw-white,primary);
.card__title {
font-size: gesso-font-size(8);
......@@ -71,10 +72,6 @@
width: inherit;
}
.uw-date {
background-color: gesso-brand(org-default, uw-gold, 'primary');
color: gesso-brand(org-default, uw-black, 'primary');
display: inline-block;
width: 100%;
@include large{
width: inherit;
}
......@@ -92,38 +89,29 @@
}
.uw-node__with-image {
.card {
> .card__body {@include uw-contained-width;}
.card__header {
@include uw-contained-width;
}
.card__body {
margin-top: -10rem;
margin-top: -7rem;
}
.card__header {
margin-bottom: 7rem;
margin-bottom: 1rem;
padding-bottom: 2rem;
.card__title {
padding: gesso-spacing(xs) gesso-spacing(md);
}
.card__sub-title {
padding: gesso-spacing(xs) gesso-spacing(md);
}
.card__date {
}
.card__author {
padding: gesso-spacing(xs) gesso-spacing(md);
}
}
.card__date {
margin-top: -2.25rem;
max-width:27rem;
.uw-date {
background-color: gesso-brand(org-default, uw-gold, 'primary');
color: gesso-brand(org-default, uw-black, 'primary');
display: inline-block;
width: inherit;
}
}
.card__footer{
......@@ -134,35 +122,7 @@
}
}
.node--type-uw-ct-event{
.uw-node__without-image {
}
.uw-node__with-image {
.card.node {
.card__body{
.card__header {
.card__date {
.uw-date-details{
.uw-date {
background-color: gesso-brand(org-default, uw-black, 'primary');
color: gesso-brand(org-default, uw-gold, 'primary');
}
}
.uw-date {
background-color: gesso-brand(org-default, uw-black, 'primary');
color: gesso-brand(org-default, uw-gold, 'primary');
width:100%;
}
}
}
}
}
}
}
.node--type-uw-ct-profile,
.node--type-uw-ct-contact {
.uw-node__without-image,
......
source/_patterns/04-components/date/_date.scss
View file @ 829274c9
.uw-date {
width: 100%
width: 100%;
// On node page make the date width auto
// On phone make date touch left
.node--type-uw-ct-event &,
.node--type-uw-ct-blog &,
.node--type-uw-ct-news-item &{
margin-left: -1rem;
width:auto;
@include large {
margin-left:inherit;
}
}
}
.uw-date-details{
background-color: gesso-brand(org-default, uw-gold, 'primary');
box-sizing: border-box;
.uw-date {
background-color: gesso-brand(org-default,uw-black,'primary');
background-color: gesso-brand(org-default, uw-gold,'primary');
box-sizing: border-box;
display:block;
padding: rem(gesso-spacing(xs)) rem(gesso-spacing(sm)) ;
......@@ -16,13 +29,13 @@
.uw-date{
background:inherit;
}
@include svg-background(mobile-arrow-down-y);
background-color: gesso-brand(org-default,uw-black,'primary');
@include svg-background(mobile-arrow-down);
background-color: gesso-brand(org-default, uw-gold,'primary');
background-position: right 1rem center; // LTR
background-repeat: no-repeat;
background-size: rem(13px);
box-sizing: border-box;
color: gesso-brand(org-default,uw-gold,'primary');
color: gesso-brand(org-default,uw-black,'primary');
cursor: pointer;
display: block;
padding:0;
......@@ -30,6 +43,6 @@
background-position: right 0.5rem center; // LTR
}
[open] > & {
@include svg-background(mobile-arrow-up-y);
@include svg-background(mobile-arrow-up);
}
}
source/_patterns/04-components/details/_details.scss
View file @ 829274c9
......@@ -11,13 +11,19 @@ $details-font-family: gesso-font-family(primary);
// 'details' can appear as a modernizr class on the html tag, so this
// class is limited to only the details element
/* stylelint-disable-next-line selector-no-qualifying-type */
details.details {
.uw-details,
.seven-details{
background-color: #fcfcfa;
border: 1px solid #bfbfbf;
border-bottom: 1px solid $card-accent-border-color;
border-radius: inherit;
box-shadow: gesso-box-shadow(1);
margin: rem(gesso-spacing(md)) 0;
transition: box-shadow gesso-duration(short) gesso-easing(ease-in-out);
width:100%;
&[open] > .seven-details__summary {
color: gesso-brand(org-default,uw-black,'primary');
}
&:hover {
box-shadow: gesso-box-shadow(3);
}
......@@ -27,6 +33,7 @@ details.details {
&:first-child{
margin-top: 0;
}
// Fallback for browsers that don’t support details.
/* stylelint-disable-next-line selector-no-qualifying-type */
.js &:not([open]) > .details__content {
......@@ -34,6 +41,7 @@ details.details {
}
}
.seven-details__summary,
.details__summary {
@include svg-background(mobile-arrow-down);
background-color: $details-background-color;
......@@ -52,7 +60,6 @@ details.details {
transition: box-shadow gesso-duration(short) gesso-easing(ease-in-out);
@if $support-for-rtl {
[dir='rtl'] & {
background-position: left $details-padding center;
......@@ -68,6 +75,7 @@ details.details {
&:hover,
&:focus{
//box-shadow: gesso-box-shadow(3);
color: gesso-brand(org-default,uw-black,'primary');
}
&:focus-within {
//box-shadow: gesso-box-shadow(3);
......@@ -97,9 +105,10 @@ details.details {
}
}
.details__description {
.details__description,
.seven-details__description{
color: $details-text-color;
font-size: rem(gesso-font-size(0));
font-size: rem(gesso-font-size(-1));
margin-bottom: rem(gesso-spacing(sm));
> :last-child {
......@@ -111,3 +120,10 @@ details.details {
.details {max-width:600px;}
}
}
.seven-details__wrapper {
padding: 1rem;
.uw-input,
.form-text{
width:100% !important;
}
}
source/_patterns/04-components/details/details.twig
View file @ 829274c9
<details class="details" {% if is_open %} open{% endif %}>
<details class="