Commit 91503941 authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-4848-m26lebla-faculty-colours' into '3.0.x'

ISTWCMS-4848 m26lebla faculty colours

See merge request !91
parents c6abab4c faf9fcba
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
*/
......
......@@ -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
......
......@@ -23,18 +23,18 @@ $test-color-12: #f00;
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;
......
......@@ -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,
......
......@@ -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;
}
}
......
......@@ -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;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
......@@ -75,8 +74,18 @@ $faculties: 'neutral', 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env'
background-color: $uw-black;
border: 1px solid #fff;
flex: 1 0 100%;
.layout--uw-2-col &,
.layout--uw-3-col &,
.layout--uw-4-col &,
.layout--uw-5-col & {
flex: 1 0 100%;
}
@include small{
flex: 1 0 50%;
}
@include medium{
// test
}
@include large{
flex: 1 0 30%;
......
$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 {
.card.banner{
.card__header{
background-color: rgba(0,0,0,.8);
}
.sub-title{
color: $uw-white;
}
.card__title {
color: $uw-gold;
a {
color: $uw-gold;
}
}
}
}
@else {
.card.banner{
.card__header{
background: rgba(gesso-brand($faculty, 'primary'), 0.8);
}
.sub-title{
color:gesso-brand($faculty, 'lvl1');
}
.card__title {
color:gesso-brand($faculty, 'lvl1');
a {
color:gesso-brand($faculty, 'lvl1');
}
}
}
}
}
}
.card.banner {
.card__body {
......@@ -10,7 +53,7 @@
display:none;
}
.card__header {
background-color: rgba(0,0,0,.8);
bottom: 0;
display: block;
height: auto;
......@@ -26,7 +69,6 @@
}
.sub-title {
color: $uw-white;