Skip to content
GitLab
Commit 9abed11a authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 9636b391 6411a04e
Hide whitespace changes
Inline Side-by-side
css/styles.css
View file @ 9abed11a
......@@ -2662,6 +2662,7 @@ svg:not(:root) {
.uw-site-footer__wrapper {
padding: 16px 0; } }
.uw-site-footer__title {
color: #fff;
font-family: "BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif;
font-size: 1.424rem;
grid-column: 1 / 2;
......@@ -2707,6 +2708,8 @@ svg:not(:root) {
grid-row: 2 / 3;
padding-bottom: 24px;
text-align: center; }
.uw-site-footer__content h2, .uw-site-footer__content h2, .uw-site-footer__content h3, .uw-site-footer__content h4, .uw-site-footer__content h5, .uw-site-footer__content h6 {
color: #fff; }
@media (min-width: 48.06rem) {
.uw-site-footer__content {
grid-column: 1 / 3;
......@@ -2716,6 +2719,8 @@ svg:not(:root) {
.uw-site-footer__content {
padding-left: 0;
padding-right: 0; } }
.uw-site-footer__content a {
color: #fff; }
/* stylelint-disable-next-line selector-no-qualifying-type */
.uw-highlighted,
......@@ -6056,6 +6061,17 @@ fieldset,
text-align: center;
top: 0.5rem;
transform: scale(0.75, 0.75) rotate(90deg); }
.no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--horizontal > .menu--item[aria-expanded="true"] > a {
border-left: inherit;
display: inline-block;
height: inherit;
overflow: inherit;
width: inherit;
z-index: 7; }
.no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--horizontal > .menu--item[aria-expanded="true"] > a span {
display: block; }
.no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--horizontal > .menu--item[aria-expanded="true"] > a::after {
transform: scale(0.75, 0.75) rotate(270deg); }
.uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--subnav {
display: none; }
.uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav {
......@@ -6072,8 +6088,12 @@ fieldset,
width: auto; }
.uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item {
max-width: inherit; }
.uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav li .menu--link-parent {
display: none !important; }
.uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item__parent {
display: none; }
.no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item a {
border-color: transparent; }
.no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item a:hover {
border-color: #e6e6e6; }
.uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--subnav {
border: 0 solid #fff; }
......
js/component_scripts.min.js
View file @ 9abed11a
/**
* @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
*/
......@@ -346,6 +329,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
*/
......
source/_patterns/00-config/_design-tokens.artifact.scss
View file @ 9abed11a
......@@ -511,4 +511,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
);
\ No newline at end of file
);
source/_patterns/03-layouts/site-footer/_site-footer.scss
View file @ 9abed11a
......@@ -19,8 +19,9 @@
}
}
&__title {
color:gesso-brand(org-default,uw-white,primary);
a{
color:#fff;
color:gesso-brand(org-default,uw-white,primary);
text-decoration:underline;
......@@ -79,7 +80,10 @@
}
&__content {
color: $uw-white;
h2,h2,h3,h4,h5,h6{
color:gesso-brand(org-default,uw-white,primary);
}
color:gesso-brand(org-default,uw-white,primary);
grid-column: 1 / 2;
grid-row: 2 / 3;
padding-bottom: gesso-spacing(md);
......@@ -94,5 +98,8 @@
padding-left: 0;
padding-right: 0;
}
a{
color:gesso-brand(org-default,uw-white,primary);
}
}
}
source/_patterns/04-components/card/card.twig
View file @ 9abed11a
......@@ -72,7 +72,7 @@
</div>
{% endif %}
{% if image %}
{% if image and not card_type == 'banner' %}
<div class="card__image">
<img src="{{ image }}" alt="{{ alt }}" />
</div>
......
source/_patterns/04-components/menu/menu--header/_menu--header.scss
View file @ 9abed11a
......@@ -71,6 +71,25 @@ $menu-horizontal-drop-bg: #f7f7f7;
}
}
}
.no-scroll & {
&[aria-expanded="true"]{
> a{
border-left:inherit;
display:inline-block;
height:inherit;
overflow:inherit;
width:inherit;
// Puts the content at z-index 7
z-index: gesso-z-index(dropdown);
span{
display:block;
}
&::after {
transform: scale(0.75, 0.75) rotate(270deg);
}
}
}
}
}
}
&--subnav {
......@@ -91,21 +110,22 @@ $menu-horizontal-drop-bg: #f7f7f7;
.menu--item{
max-width:inherit;
}
li{
.menu--link-parent{
display:none !important;
&__parent{
display:none;
}
a{
.no-scroll &{
border-color:transparent;
&:hover{
border-color:#e6e6e6;
}
}
}
}
.menu--subnav{
border:0 solid #fff;
}
> li{
}
}
}
}
}
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