Commit 6d5dd828 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 2c86e134 91503941
......@@ -26,6 +26,10 @@ if [[ -d gesso ]]; then
fi
git clone --branch $gesso_version https://git.uwaterloo.ca/drupal-org/gesso.git
if [ "$?" != 0 ]; then
echo "Error: git clone failed"
exit 2;
fi
if [[ $build_option == 1 || $build_option == 3 ]]; then
......@@ -54,6 +58,10 @@ if [[ $build_option == 1 || $build_option == 3 ]]; then
echo "Running npm install ..."
cd gesso
npm install
if [ "$?" != 0 ]; then
echo "Error: npm install failed"
exit 2;
fi
echo "Done npm install."
echo "**************************************************************************************"
echo ""
......@@ -85,6 +93,10 @@ if [[ $build_option == 1 || $build_option == 3 ]]; then
echo "**************************************************************************************"
echo "Running gulp build ..."
gulp build
if [ "$?" != 0 ]; then
echo "Error: gulp build failed"
exit 2;
fi
cd ..
echo "Done running gulp build."
echo "**************************************************************************************"
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -338,6 +338,23 @@ else if (e.keyCode === 37) {
};
})(jQuery, Drupal);
/**
* @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
*/
......@@ -373,23 +390,6 @@ 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
*/
......
......@@ -220,7 +220,7 @@ gesso:
generic:
background: "#A2A2A2"
background-darker: "#000"
background-dark: "#4e4e4e"
background-dark: "#757575"
background-light: "#eee"
background-lighter: "#fafafa"
border: "#A2A2A2"
......@@ -326,54 +326,46 @@ gesso:
loose: 1.7
display:
display:
color: "#000"
font-family: georgia, "droid serif", "Times New Roman", Times, serif
font-size: 41.056px
font-weight: 400
h1:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif'
font-size: 41.056px
font-weight: 400
line-height: 1.1
h2:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif'
font-size: 28.832px
font-weight: 400
line-height: 1.1
h3:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif'
font-size: 22.784px
font-weight: 400
line-height: 1.1
h4:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif'
font-size: 20.256px
font-weight: 400
line-height: 1.1
h5:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif'
font-size: 18px
font-weight: 400
line-height: 1.1
h6:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif'
font-size: 16px
font-weight: 400
line-height: 1.1
blockquote:
color: "#4e4e4e"
font-family: georgia, "droid serif", "Times New Roman", Times, serif
font-size: 22.784px
font-weight: 400
......
......@@ -11,20 +11,30 @@ $test-color-10: #00ff58;
$test-color-11: #3e3d12;
$test-color-12: #f00;
@mixin uw-no-breakout {
//-ms-hyphens: auto;
//-moz-hyphens: auto;
//-webkit-hyphens: auto;
//hyphens: auto;
overflow-wrap: break-word;
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
word-wrap: break-word;
}
@mixin uw-contained-width {
@mixin uw-contained-width($value:$max-width) {
margin-left: auto;
margin-right: auto;
max-width:$max-width;
max-width:$value;
padding: 0 gesso-spacing(sm);
@include xl{
padding-left:0;
padding-right:0;
}
}
@mixin uw-full-width {
max-width: 100%;
padding: 0;
......
......@@ -263,7 +263,7 @@ $gesso: (
generic: (
background: #A2A2A2,
background-darker: #000,
background-dark: #4e4e4e,
background-dark: #757575,
background-light: #eee,
background-lighter: #fafafa,
border: #A2A2A2,
......@@ -381,55 +381,47 @@ $gesso: (
),
display: (
display: (
color: #000,
font-family: 'georgia, "droid serif", "Times New Roman", Times, serif',
font-size: 41.056px,
font-weight: 400,
),
h1: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 41.056px,
font-weight: 400,
line-height: 1.1,
),
h2: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 28.832px,
font-weight: 400,
line-height: 1.1,
),
h3: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 22.784px,
font-weight: 400,
line-height: 1.1,
),
h4: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 20.256px,
font-weight: 400,
line-height: 1.1,
),
h5: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 18px,
font-weight: 400,
line-height: 1.1,
),
h6: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 16px,
font-weight: 400,
line-height: 1.1,
),
blockquote: (
color: #4e4e4e,
font-family: 'georgia, "droid serif", "Times New Roman", Times, serif',
font-size: 22.784px,
font-weight: 400,
......@@ -511,4 +503,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
);
\ No newline at end of file
);
......@@ -220,7 +220,7 @@ gesso:
generic:
background: grayscale.gray-4
background-darker: grayscale.black
background-dark: grayscale.gray-6
background-dark: grayscale.gray-5
background-light: grayscale.gray-2
background-lighter: grayscale.gray-1
border: grayscale.gray-4
......@@ -317,48 +317,40 @@ gesso:
loose: 1.7
display:
display:
color: text.primary
font-family: primary.stack
font-size: 8
font-weight: regular
h1:
color: text.primary
font-family: condensedbook.stack
font-size: 8
font-weight: regular
line-height: tight
h2:
color: text.primary
font-family: condensedbook.stack
font-size: 5
font-weight: regular
line-height: tight
h3:
color: text.primary
font-family: condensedbook.stack
font-size: 3
font-weight: regular
line-height: tight
h4:
color: text.primary
font-family: condensedbook.stack
font-size: 2
font-weight: regular
line-height: tight
h5:
color: text.primary
font-family: condensedbook.stack
font-size: 1
font-weight: regular
line-height: tight
h6:
color: text.primary
font-family: condensedbook.stack
font-size: 0
font-weight: regular
line-height: tight
blockquote:
color: text.link
font-family: primary.stack
font-size: 3
font-weight: regular
......
$faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat', 'org-sci', 'org-school';
@each $faculty in $faculties {
// Wrapping the element with this class, <body>.
.#{$faculty} {
// If the UW branding group
@if $faculty == org-default {
// Headings
h1,
h2,
h3,
h4,
h5,
h6 {
color: $uw-black;
}
// Generic links
a {
&:not(.button){
color: $uw-black;
&:hover,
&:focus {
color: $uw-grey;
}
}
}
.menu--uw-footer li a{
color: $uw-white;
&:hover,
&:focus
{
color:$uw-gold;
}
}
.uw-site-footer__content a{
color: $uw-white;
&:visited,
&:hover,
&:focus,
&:active
{
color:$uw-white;
}
}
.uw-footer__social-directory a{
&:link,
&:visited {
color: $uw-white;
}
&:hover,
&:focus{
color:$uw-gold;
}
}
.uw-territorial a{
&:link,
&:visited {
color: $uw-gold;
}
&:hover,
&:focus{
color:$uw-gold;
}
}
&.global-site-footer{
&:visited,
&:active{
color: $uw-black !important;
}
}
}
// Else run the loop on the faculties.
@else {
// MAke primary color.
.uw-blockquote__text,
.uw-blockquote__text::before,
.uw-blockquote__text::after,
.uw-blockquote__attribution,
.uw-blockquote__attribution cite{
color: gesso-brand($faculty, 'primary');
}
// Generic links.
a,
.card__title a{
color: gesso-brand($faculty, 'primary');
&:visited {
color: gesso-brand($faculty, 'primary');
}
&:hover,
&:focus {
color: gesso-brand($faculty, 'primary');
}
// Links as buttons need white.
&.button {
color: $uw-white;
&:hover,
&:focus {
color: $uw-grey;
}
}
&.pager__link {
color: $uw-black;
}
&.global-site-footer{
&:visited{
color: $uw-black;
}
&:hover,
&:focus {
background-color: $uw-black;
color: $uw-gold;
}
&:active{
color: $uw-black;
}
}
}
.menu--uw-footer li a{
color: $uw-white;
&:hover,
&:focus
{
color:$uw-gold;
}
}
.uw-site-footer__content a{
color: $uw-white;
&:visited,
&:hover,
&:focus,
&:active
{
color:$uw-white;
}
}
.uw-footer__social-directory a{
&:link,
&:visited {
color: $uw-white;
}
&:hover,
&:focus{
color:$uw-gold;
}
}
.uw-territorial a{
&:link,
&:visited {
color: $uw-gold;
}
&:hover,
&:focus{
color:$uw-gold;
}
}
// Blackout the link
.views-exposed-form a,
.uw-site-name__link,
.layout-builder__link,
.timeline-info__withlink a,
.tabs a,
.toolbar-tray a,
.ui-dialog-content a,
.messages--status a,
.uw-content-moderation a{
color:$uw-black;
&:visited,
&:hover,
&:focus,
&:active
{
color:$uw-black;
}
}
}
}
}
{% set date_modifier_classes -%}
uw-date uw-date--{{ date_format|replace({'-' : '_'})}} {{ date_modifier_classes }}
uw-date {{ date_modifier_classes }}
{%- endset %}
{% if is_demo %}
<div class='uw-date-pl'>
......@@ -12,4 +12,4 @@
{% if is_demo %}
</div>
{% endif %}
\ No newline at end of file
{% endif %}
......@@ -20,13 +20,6 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
font-size: gesso-font-size(-1);
padding: rem(gesso-spacing(xs)) rem(gesso-spacing(sm));
text-transform: uppercase;
&--long_date{}
&--long_date_time{}
&--medium_date{}
&--medium_date_time{}
&--short_date{}
&--short_date_time{}
}
@each $faculty in $faculties {
......@@ -42,7 +35,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
}
@else {
background-color:gesso-brand($faculty,'primary');
color: gesso-brand($faculty, 'lvl1');
color: $uw-white;
}
}
}
......
......@@ -81,15 +81,12 @@
}
a {
color: #fff;
font-family: gesso-font-family(systemmedium);
font-size: gesso-font-size(-2);
text-decoration: none;
}
a:hover {
color: #fdd54f;
text-decoration: underline;
}
}
......
......@@ -22,7 +22,7 @@
'items': footer_menu
}%}
{% if pattern_lab %}
{% include "@components/eu-cookie-compliance/eu-cookie-compliance.twig" %}
{# {% include "@components/eu-cookie-compliance/eu-cookie-compliance.twig" %}#}
{% endif %}
{% endblock %}
</div>
......@@ -28,6 +28,7 @@
&:hover,
&:focus
{
color:gesso-brand(org-default,uw-white,primary);
text-decoration:none;
}
......
......@@ -51,16 +51,20 @@
text-align: left;
}
&::before {
content: "-";
}
cite {
color: $uw-black;
font-family:gesso-font-family(primary);
font-size:rem(gesso-font-size(0));
font-family:gesso-font-family(condensedbook);
font-size:rem(gesso-font-size(1));
font-weight: normal;
text-align: left;
text-transform:uppercase;
> :first-child::before{
content: "\2014";
display:inline-block;
padding-right:gesso-spacing(sm);
}
}
}
}
......@@ -3,6 +3,7 @@
<div class="uw-blockquote__text">
{{ blockquote.text }}
</div>
{% if blockquote.attribution %}
<footer class="uw-blockquote__attribution">
<div class="uw-blockquote__attribution--wrapper">
<cite>
......@@ -10,5 +11,6 @@
</cite>
</div>
</footer>
{% endif %}
</div>
</blockquote>
......@@ -53,7 +53,6 @@ $faculties: 'neutral', 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env'
.uw-cta__center-wrapper {
align-items: center;
display: inline-flex;
-ms-flex-align: center;