Commit 9636b391 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 26a685e8 9830e44b
This diff is collapsed.
This diff is collapsed.
/**
* @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
*/
......@@ -329,23 +346,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
*/
......@@ -497,24 +497,27 @@ else {
// Check the width of the screen and
// force the button click if wider that 767px.
function menuCheckWidth() {
// Set screenWidth var.
// Check if menu is on page.
if (navHeader) {
// Set screenWidth var.
var screenWidth = $(window).width();
navHeader.classList.add('close');
if (screenWidth > 767) {
if ($('html').hasClass('no-scroll')) {
toggle.click();
$('.uw-horizontal-nav').css('display', 'block');
}
if ($('html').hasClass('no-scroll')) {
toggle.click();
$('.uw-horizontal-nav').css('display', 'block');
}
else {
$('.uw-header__navigation').addClass('open');
}
$('.uw-header__navigation').addClass('open');
}
}
else {
if ($('.uw-header__navigation').hasClass('open')) {
$('.uw-header__navigation').removeClass('open');
$('.uw-header__navigation').addClass('close');
}
if ($('.uw-header__navigation').hasClass('open')) {
$('.uw-header__navigation').removeClass('open');
$('.uw-header__navigation').addClass('close');
}
}
}
}
// Listen to event resize and apply the debouncer
......@@ -592,3 +595,31 @@ else {
}
}
})(jQuery, document, Drupal);
/**
* @file
*/
(function ($, Drupal) {
Drupal.behaviors.viewcontact = {
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);
......@@ -440,7 +440,7 @@ gesso:
xs: 8px
sm: 16px
md: 24px
lg: 40px
lg: 32px
xl: 56px
xxl: 96px
gutter-width: 40px
$test-color-1: #b9f1c5;
$test-color-2: #eeaab0;
$test-color-3: #eae9a9;
$test-color-3: #0036d9;
$test-color-4: #f5a4f4;
$test-color-5: #a753b6;
$test-color-6: #db5c3a;
$test-color-6: #f61515;
$test-color-7: #257471;
$test-color-8: #68633f;
$test-color-9: rgb(0, 161, 255);
......@@ -30,13 +30,33 @@ $test-color-12: #f00;
padding: 0;
width: 100%;
}
}
@mixin uw-full-width-padding {
max-width: 100%;
padding: 0 gesso-spacing(sm);
width: 100%;
}
@mixin uw-full-width-margin {
left: 50%;
margin-left: -50vw;
margin-right: -50vw;
max-width: 100vw;
padding:0;
position: relative;
right: 50%;
width: 100vw;
}
@mixin uw-full-width-reset {
left: 0;
margin-left: -1rem;
margin-right: -1rem;
max-width: 100%;
padding: 0;
position: relative;
right: 0;
width: 100%;
}
// Flexbox display
@mixin flexbox {
......@@ -254,18 +274,18 @@ $test-color-12: #f00;
@if $value == inline-flex {
@include inline-flex();
@include flex-flow(row wrap);
gap:1.25rem
gap:$grid-gap;
}@else if $value == term{
@include flexbox();
@include flex-wrap(wrap);
gap:1.25rem
gap:$grid-gap;
}@else if $value == card{
@include flexbox();
@include flex-direction(column);
}@else{
@include flexbox();
@include flex-flow(row wrap);
gap:1.25rem
gap:$grid-gap;
}
}
// Display of grid item.
......
......@@ -506,9 +506,9 @@ $gesso: (
xs: 8px,
sm: 16px,
md: 24px,
lg: 40px,
lg: 32px,
xl: 56px,
xxl: 96px,
),
gutter-width: 40px,
);
);
\ No newline at end of file
......@@ -425,7 +425,7 @@ gesso:
xs: 8px
sm: 16px
md: 24px
lg: 40px
lg: 32px
xl: 56px
xxl: 96px
gutter-width: 40px
......@@ -69,7 +69,8 @@ input {
// input[type='week'] {}
label,
.label,{
.label,
.uw-label{
font-family: $form-label-font-family;
font-size: gesso-font-size(2);
font-weight: gesso-font-weight(regular);
......
......@@ -47,3 +47,8 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
}
}
}
.uw-date-details{
}
.uw-carousel {
display: block;
width: 100%;
}
}
.owl-stage-outer{
margin-bottom: 1rem;
}
// style the carousel buttons
.uw-owl-nav{
&.disabled{
......
// Universal Gap
$grid-gap: rem(gesso-spacing(lg));
.layout {
@include uw-contained-width;
&.uw-contained-width{
grid-gap:$grid-gap;
&.uw-contained-width {
@include uw-contained-width;
//background: $test-color-6;
padding: rem(gesso-spacing(sm));
@include xxl {
padding:rem(gesso-spacing(sm)) 0;
padding: rem(gesso-spacing(sm)) 0;
}
&--narrow {
/* Match the width of WCMS2's narrow: 496px */
max-width: 31rem;
}
&--wide {
/* Match the width of WCMS2's wide: 753px */
max-width: 47.0625rem;
......@@ -18,99 +25,64 @@
}
&.uw-full-width {
@include uw-full-width;
.uw-section-has-full-width.uw-node__with-sidebar &{
padding: 0 gesso-spacing(sm) !important;
}
@include uw-full-width-padding;
.dashboards-container &{
@include uw-full-width;
}
&.layout--uw-1-col{
.block-inline-blockuw-cbl-banner-images,
.block-inline-blockuw-cbl-image,
.block-inline-blockuw-cbl-remote-video {
@include uw-full-width-margin;
h2{
margin-left:1rem;
}
.uw-section-has-full-width.uw-node__with-sidebar &{
@include uw-full-width-reset;
}
}
.block-inline-blockuw-cbl-google-maps{
@include medium{
@include uw-full-width-margin;
}
.uw-section-has-full-width.uw-node__with-sidebar &{
@include uw-full-width-reset;
}
h2{
margin-left:1rem;
}
}
}
}
// When wrapped with class to identify sidebar
.uw-node__with-sidebar & {
margin:inherit;
max-width:100%;
margin: inherit;
@include medium {
@include uw-contained-width;
}
&.uw-contained-width{
&.uw-contained-width {
@include uw-contained-width;
margin:inherit;
margin: inherit;
padding: rem(gesso-spacing(sm));
@include xxl {
padding:rem(gesso-spacing(sm)) 0;
padding: rem(gesso-spacing(sm)) 0;
}
&--narrow {
/* Match the width of WCMS2's narrow: 496px */
margin:inherit;
margin: inherit;
}
&--wide {
/* Match the width of WCMS2's wide: 753px */
margin:inherit;
margin: inherit;
}
}
}
}// Term page layout
$sidebar-width: 18.75rem;
.uw-term--layout{
display: flex;
flex-direction: column;
margin-bottom:2.5rem;
margin-top:1.5rem;
position:relative;
.uw-content--grid-list{
&__style_controls{
padding:0;
width:100%;
}
}
.l-section{
margin:0 !important;
width:100%;
}
.uw-term--header{
width:100%;
}
.uw-term--results{
width:100%;
}
.uw-term--filters{
display:none;
width:100%;
.uw-input{
width:100% !important;
}
.l-section__content{
margin:0;
max-width:inherit;
padding:0;
width:100%;
}
}
@include medium{
display: flex;
flex-direction: row;
gap: 1.5rem;
justify-content: center;
.uw-term--results{
width: clamp(320px, 900px, calc(100vw - 333px));
}
.uw-term--filters{
display:inherit;
margin: 0;
.grid &,
.list &{
margin-top: 4rem !important;
}
width: $sidebar-width;
.uw-input,
.form-text{
width:100% !important;
}
.views-exposed-form{
margin:0 !important;
padding:0 !important;
}
}
}
}
.views-filter{
position:sticky;
top: 20px;
}
.uw-section-has-full-width.uw-node__with-sidebar .layout.layout--uw-1-col{overflow:hidden}
......@@ -7,7 +7,6 @@
} %}
{% set section_classes = '' %}
<section
{% if pattern_lab %}
class="{{ classes }}"
......@@ -68,4 +67,4 @@
{% endfor %}
</section>
\ No newline at end of file
</section>
.layout--uw-2-col {
display: grid;
gap:$grid-gap;
grid-template-columns:100%;
&.larger-left {
@include medium{
grid-template-columns: 67% 33%;
grid-template-columns: minmax(0, 2fr) 1fr;
}
}
&.larger-right {
@include medium{
grid-template-columns: 33% 67%;
grid-template-columns: 1fr minmax(0, 2fr);
}
}
&.even-split {
grid-template-columns:100%;
@include medium{
grid-template-columns: 50% 50%;
grid-template-columns: repeat(2, 1fr);
}
}
.layout__region{
......
.layout--uw-3-col {
display: grid;
gap:$grid-gap;
&.even-split {
grid-template-columns:100%;
@include medium{
grid-template-columns: 33% 34% 33%;
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr);
}
}
&.larger-left {
grid-template-columns:100%;
@include medium{
grid-template-columns: 50% 25% 25%;
grid-template-columns: minmax(0, 2fr) minmax(0, 1fr) minmax(0, 1fr);
}
}
&.larger-middle {
grid-template-columns:100%;
@include medium{
grid-template-columns: 25% 50% 25%;
grid-template-columns: minmax(0, 1fr) minmax(0, 2fr) minmax(0, 1fr);
}
}
&.larger-right {
grid-template-columns:100%;
@include medium{
grid-template-columns: 25% 25% 50%;
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 2fr);
}
}
&.legacy-38-38-24 {
grid-template-columns:100%;
@include medium{
grid-template-columns: 38% 38% 24%;
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) 24%;
}
}
&.legacy-24-38-38 {
grid-template-columns:100%;
@include medium{
grid-template-columns: 24% 38% 38%;
grid-template-columns: 24% minmax(0, 1fr) minmax(0, 1fr);
}
}
.layout__region{
......
.layout--uw-4-col {
display: grid;
gap:$grid-gap;
grid-template-columns:100%;
&.even-split {
@include medium {
grid-template-columns: 25% 25% 25% 25%;
@include small{
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
}
@include large {
grid-template-columns:minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr);
}
}
&.larger-left {
@include medium {
grid-template-columns: 50% 16.67% 16.67% 16.66%;
@include small{
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
}
@include large {
grid-template-columns: minmax(0, 3fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr);
}
}
&.larger-second {
@include medium {
grid-template-columns: 16.67% 50% 16.67% 16.66%;
@include small{
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
}
@include large {
grid-template-columns: minmax(0, 1fr) minmax(0, 3fr) minmax(0, 1fr) minmax(0, 1fr);
}
}
&.larger-third {
@include medium {
grid-template-columns: 16.67% 16.67% 50% 16.66%;
@include small{
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
}
@include large {
grid-template-columns: minmax(0, 1fr) minmax(0, 3fr) minmax(0, 1fr);
}
}
&.larger-right {
@include medium {
grid-template-columns: 16.67% 16.67% 16.66% 50%;
@include small{
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
}
@include large {
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 3fr);
}
}
&.legacy-23-27-27-23 {
@include medium {
grid-template-columns: 23% 27% 27% 23%;
@include small{
grid-template-columns:minmax(0, 1fr) minmax(0, 1fr);
}
@include large {
grid-template-columns: minmax(0, 0.8fr) minmax(0, 1.1fr) minmax(0, 1.1fr) minmax(0, 0.8fr);
}
}
.layout__region{
&--first {
grid-column: 1 / 2;
grid-row: 1 / 2;
}
&--second {
grid-column: 1 / 2;
grid-row: 2 / 3;
@include medium{
@include small{
grid-column: 2 / 3;
}
@include large{
grid-column: 2 / 3;
grid-row:1 / 2;
}
}