Commit 0fb9b557 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents b4668018 a2ac4171
......@@ -341,6 +341,7 @@ $test-color-12: #f00;
// Display of list item.
@mixin uw-flex-term-item(){
align-self: flex-start;
width:100%;
@include medium{
@include flex(1 1 auto);
......
......@@ -57,6 +57,16 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
color:$uw-white;
}
}
.uw-site-footer__content table a{
color: $uw-black;
&:visited,
&:hover,
&:focus,
&:active
{
color:$uw-black;
}
}
.uw-site-footer__social-media a {
&:visited,
&:hover,
......@@ -167,6 +177,16 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
color:$uw-white;
}
}
.uw-site-footer__content table a{
color: $uw-black;
&:visited,
&:hover,
&:focus,
&:active
{
color:$uw-black;
}
}
.uw-site-footer__social-media a {
&:visited,
&:hover,
......
......@@ -15,3 +15,24 @@
.is-collapse-enabled .tabs__trigger{
z-index: gesso-z-index(content);
}
// Code for show hide revision/tabs
.uw-show-hide{
background-color: rgb(255, 255, 255);
bottom: 4rem;
color: rgb(150, 23, 46);
cursor: pointer;
display:none;
font-size: 2rem;
height: auto;
padding: 0;
position: fixed;
right:1rem;
text-decoration: none;
width: 2rem;
z-index: gesso-z-index(overlay);
}
.block-local-tasks-block,
.uw-content-moderation{
display:block;
}
// end.
{% set main_classes = 'uw-main' %}
<button class="uw-show-hide" id="revision-show-hide" title="Show/hide revision elements">±</button>
{% for class in classes %}
{% set main_classes = main_classes ~ ' ' ~ class %}
{% endfor %}
<main id="main" class="{{ main_classes }}" role="main" tabindex="-1">
{% block content %}
Main content
......
......@@ -11,9 +11,6 @@
@include medium {
grid-template-columns: auto 18rem;
}
//@include large {
// grid-template-columns: auto 16rem;
//}
@include xl{
padding:gesso-spacing(sm) 0;
}
......@@ -99,6 +96,14 @@
a{
color:gesso-brand(org-default,uw-white,primary);
}
table {
caption{
color:gesso-brand(org-default,uw-white,primary);
}
*{
color:gesso-brand(org-default,uw-black,primary);
}
}
}
.uw-admin-label {
......
{% if site_name or logo_url %}
<div class="uw-site-footer">
<div class="uw-site-footer__wrapper">
......@@ -24,3 +25,4 @@
</div>
</div>
</div>
{% endif %}
.dashboards{
&-container{
.panel{
padding:0;
}
.uw-search-form {
margin:0 0 gesso-spacing(sm) 0;
.catalog-search-form,
.service-search-form,
.uw-project-search-form {
.form-item{
height:2.39rem;
margin:0;
}
.form-text {
height:2.39rem;
margin:0;
}
}
}
}
}
......@@ -10,3 +10,11 @@ ul.toolbar-menu {
padding-left: 0;
}
}
/* stylelint-disable-next-line selector-no-qualifying-type */
.org-default .toolbar .toolbar-bar .toolbar-item {
color: $uw-white;
&:hover,
&:focus {
color: $uw-white;
}
}
/**
* Javascript for buttons
*/
(function ($, Drupal) {
Drupal.behaviors.buttons = {
attach: function (context, settings) {
// Only show the show/hide button if the user is logged in and on the "view", "layout", or "latest version" tabs.
// (We have picked elements that should only exist on those pages, and only when the user has editing access.)
$(document).ready(
function () {
if ($('.user-logged-in .uw-content-moderation, .user-logged-in #edit-moderation-state-wrapper, .user-logged-in #block-tabs a.is-active[href$=\'latest\']').length) {
$('.uw-show-hide').show().on(
'click', function () {
toggleTabs();
}
);
}
function toggleTabs()
{
var x = document.getElementById('block-tabs');
var y = document.getElementsByClassName('uw-content-moderation')[0];
var z = document.getElementById('edit-moderation-state-wrapper');
if (x.style.display === 'none') {
x.style.display = 'block';
} else {
x.style.display = 'none';
}
if (y) {
if (y.style.display === 'none') {
y.style.display = 'block';
} else {
y.style.display = 'none';
}
}
if (z) {
if (z.style.display === 'none') {
z.style.display = 'block';
} else {
z.style.display = 'none';
}
}
}
}
);
}
};
})(jQuery, Drupal);
......@@ -80,7 +80,32 @@ $card-padding: rem(gesso-spacing(sm)) !default;
@include uw-no-breakout();
margin-bottom: rem(gesso-spacing(xs));
width: 100%;
.card__node--event & {
display:grid;
grid-template-columns:1fr auto;
.card__author{
grid-column: 1/2;
}
.card__date{
grid-column: 1/2;
}
.card__title{
grid-column: 1/2;
}
.view-interact{
background-color: $uw-white;
grid-column: 2/3;
grid-row:2/3;
margin:0;
padding:1rem 1rem 0 0 ;
.uw-node__without-image & {
grid-column: 2/3;
grid-row:inherit;
margin-bottom:1rem;
padding:0;
}
}
}
}
.card__date {
font-size: rem(gesso-font-size(0));
......
......@@ -18,5 +18,6 @@
'content': node.content,
'footer': node.footer,
'tags': node.tags,
'ical': node.ical,
} %}
</div>
......@@ -80,4 +80,11 @@
'job_id': header.job_id
} %}
{% endif %}
{% if ical %}
{% include '@components/view/view-interact/view-interact.twig' with {
'ical': ical
}%}
{% endif %}
</div>
......@@ -31,6 +31,8 @@
} %}
{% endif %}
{% if header and show_header == 'yes' %}
{% include '@components/card/card-elements/_header.twig' with {
'header': header,
......
......@@ -13,9 +13,7 @@
<{{ exp_col.heading_selector }}>{{ ec.heading_text }}</{{ exp_col.heading_selector }}>
</summary>
<div class="details__content">
{% for group in ec.groups %}
{{ group }}
{% endfor %}
{{ ec.content }}
</div>
</details>
{% endfor %}
......
......@@ -4,6 +4,7 @@
align-items: center;
display:inline-flex;
height: 1.5rem;
line-height:normal;
width: 1.5rem;
svg {
height: 1.5rem;
......
......@@ -16,11 +16,13 @@ $icon-font-size-small: rem(gesso-font-size(0)) !default;
font-weight: gesso-font-weight(regular);
gap:0.25rem;
height:3rem;
line-height:normal;
padding:0 0.5rem;
transition:background gesso-duration(short) gesso-easing(ease-in);
.uw-icon {
align-items: center;
display:flex;
line-height:normal;
svg {
fill: gesso-brand(org-default,uw-black,'primary');
}
......
......@@ -3,7 +3,7 @@
{% for icon in icons %}
{% if icon.url %}
<a {% if icon.aria %} aria-{{ icon.aria_type_name }}="{{ icon.aria_type_value}}" {% endif %} {% if icon.data_type_name %} data-{{ icon.data_type_name }}="{{ icon.data_type_value }}"{% endif %} {% if icon.btn_id %} id="{{ icon.btn_id }}" {% endif %} href="{{ icon.url }}" class="uw-icon-link {{ modifier_classes }}">
<a {% if icon.aria %} aria-{{ icon.aria_type_name }}="{{ icon.aria_type_value}}" {% endif %} {% if icon.data_type_name %} data-{{ icon.data_type_name }}="{{ icon.data_type_value }}"{% endif %} {% if icon.btn_id %} id="{{ icon.btn_id }}" {% endif %} href="{{ icon.url }}" class="uw-icon-link {{ icon.modifier_classes }}" {% if icon.is_download %} download {% endif %}>
{% endif %}
{% include '@components/icon/icon.twig' with {
name: icon.name,
......@@ -26,7 +26,7 @@
{% if url %}
<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 %} href="{{ url }}" class="uw-icon-link {{ modifier_classes }}">
<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 %} href="{{ url }}" class="uw-icon-link {{ modifier_classes }}" {% if is_download %} download {% endif %}>
{% endif %}
{% include '@components/icon/icon.twig' with {
name: name,
......
.uw-mailchimp{
&__wrapper{
.mc-field-group{
margin: 0 0 rem(gesso-spacing(sm));
input{
background-color:$uw-input-background-color;
border: 1px solid $uw-input-border-color;
border-radius: 3px;
box-shadow: inset 0 1px 3px $uw-input-border-color;
box-sizing: border-box;
color: $uw-input-text-color;
font-family: $uw-input-font-family;
font-size: $uw-input-font-size;
max-width:inherit;
padding: $uw-input-padding;
transition: border-color;
width: 100%;
&:focus {
border: 1px solid $uw-input-border-color-focus !important;
box-shadow: inset 0 1px 3px rgba(0,0,0,.06), 0 0 5px rgba(104,104,104,.7);
outline:$uw-input-border-color-focus;
}
[type="submit"] {
@include button();
font-weight:200 !important;
}
}
}
.brandingLogo{
margin:1rem auto;
}
.indicates-required{
text-align: right;
}
.asterisk{
color:#e00;
font-family:gesso-font-family(system);
font-size: gesso-font-size(2);
font-weight: gesso-font-weight(regular);
}
.datefield{
input{
width: inherit;
}
}
select {
@include svg-background(select-arrows);
appearance:none;
background-color:$uw-input-background-color;
background-position: right rem($form-select-arrow-size / 2) center; // LTR
background-repeat: no-repeat;
background-size: rem($form-select-arrow-size);
border: 1px solid $uw-input-border-color;
border-radius: 3px;
box-shadow: inset 0 1px 3px $uw-input-border-color;
box-sizing: border-box;
height: rem(37.9062px);
padding-left:0.5rem; // LTR
padding-right: rem($form-select-arrow-size * 2); // LTR
width:100%;
@if $support-for-rtl {
[dir='rtl'] & {
background-position: left rem($form-select-arrow-size / 2) center;
padding-left: rem($form-select-arrow-size * 2);
padding-right: 0;
}
}
// Remove inner focus styling on Firefox.
&:-moz-focusring {
color: transparent;
text-shadow: 0 0 0 #000;
}
&::-ms-expand {
display: none;
}
}
}
}
......@@ -2,19 +2,24 @@
// Styles for Site logo.
.uw-site-logo {
.uw-site-logo__link{
.uw-site-logo__link {
background: url('../source/images/logos/uwaterloo-logo.svg') 0 50% no-repeat;
background-color: gesso-brand(org-default,uw-black,lvl4);
background-size: contain;
color: gesso-brand(org-default,uw-black,lvl4);
color: $uw-white;
display: block;
height:2.5rem;
text-align:center;
height: 2.5rem;
outline: 1px solid transparent;
text-align: center;
text-indent: -999rem;
width:8rem;
width: 8rem;
@include xs {
height: 2.5rem;
width:12.5rem;
width: 10.6rem;
}
&:hover,
&:focus {
outline: 1px solid $uw-white;
}
}
}
......@@ -3,31 +3,33 @@
.skiplinks {
display: flex;
font-family: gesso-font-family(system);
font-family: gesso-font-family(book);
font-size: gesso-font-size(-1);
justify-content: center;
position: absolute;
width: 100%;
z-index: 9999;
}
z-index: gesso-z-index(overlay);
&__link{
color:$uw-white !important;
&:focus{
background-color:transparent;
border: 1px solid $uw-white;
border-top: 0;
color:$uw-white !important;
display: inline-block;
font-weight:200;
margin: 0;
outline: 0;
padding: rem(gesso-spacing(xs));
text-align: center;
text-decoration: none;
&:hover{
background-color:$uw-white;
color:$uw-black !important;
}
}
.skiplinks__link,
.skiplinks__link:visited,
.skiplinks__link:focus {
background-color: gesso-color(ui, generic, background-dark);
border: 2px solid gesso-color(ui, generic, border-light);
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-top: 0;
box-shadow: gesso-box-shadow(2);
color: gesso-color(text, on-dark);
display: inline-block;
font-weight: bold;
line-height: gesso-line-height(tight);
margin: 0;
outline: 0;
padding: rem(gesso-spacing(xs));
text-align: center;
text-decoration: none;
}
}
// Remove :focus styles for skiplink targets.
......
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