Commit ba9a8327 authored by wodby's avatar wodby
Browse files

some css for faculty color changes

parent 5f928d7a
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.
...@@ -580,18 +580,6 @@ else { ...@@ -580,18 +580,6 @@ else {
}; };
})(jQuery, Drupal); })(jQuery, Drupal);
/**
* @file
*/
(function ($, document, Drupal) {
Drupal.behaviors.wcmsheadersearchbar = {
attach: function (context, settings) {
}
}
})(jQuery, document, Drupal);
/** /**
* @file * @file
*/ */
...@@ -640,6 +628,18 @@ else { ...@@ -640,6 +628,18 @@ else {
} }
})(jQuery, document, Drupal); })(jQuery, document, Drupal);
/**
* @file
*/
(function ($, document, Drupal) {
Drupal.behaviors.wcmsheadersearchbar = {
attach: function (context, settings) {
}
}
})(jQuery, document, Drupal);
/** /**
* @file * @file
*/ */
......
...@@ -326,54 +326,46 @@ gesso: ...@@ -326,54 +326,46 @@ gesso:
loose: 1.7 loose: 1.7
display: display:
display: display:
color: "#000"
font-family: georgia, "droid serif", "Times New Roman", Times, serif font-family: georgia, "droid serif", "Times New Roman", Times, serif
font-size: 41.056px font-size: 41.056px
font-weight: 400 font-weight: 400
h1: h1:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif' Sans", sans-serif'
font-size: 41.056px font-size: 41.056px
font-weight: 400 font-weight: 400
line-height: 1.1 line-height: 1.1
h2: h2:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif' Sans", sans-serif'
font-size: 28.832px font-size: 28.832px
font-weight: 400 font-weight: 400
line-height: 1.1 line-height: 1.1
h3: h3:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif' Sans", sans-serif'
font-size: 22.784px font-size: 22.784px
font-weight: 400 font-weight: 400
line-height: 1.1 line-height: 1.1
h4: h4:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif' Sans", sans-serif'
font-size: 20.256px font-size: 20.256px
font-weight: 400 font-weight: 400
line-height: 1.1 line-height: 1.1
h5: h5:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif' Sans", sans-serif'
font-size: 18px font-size: 18px
font-weight: 400 font-weight: 400
line-height: 1.1 line-height: 1.1
h6: h6:
color: "#000"
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid
Sans", sans-serif' Sans", sans-serif'
font-size: 16px font-size: 16px
font-weight: 400 font-weight: 400
line-height: 1.1 line-height: 1.1
blockquote: blockquote:
color: "#4e4e4e"
font-family: georgia, "droid serif", "Times New Roman", Times, serif font-family: georgia, "droid serif", "Times New Roman", Times, serif
font-size: 22.784px font-size: 22.784px
font-weight: 400 font-weight: 400
......
...@@ -23,18 +23,18 @@ $test-color-12: #f00; ...@@ -23,18 +23,18 @@ $test-color-12: #f00;
word-wrap: break-word; word-wrap: break-word;
} }
@mixin uw-contained-width { @mixin uw-contained-width($value:$max-width) {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
max-width:$max-width; max-width:$value;
padding: 0 gesso-spacing(sm); padding: 0 gesso-spacing(sm);
@include xl{ @include xl{
padding-left:0; padding-left:0;
padding-right:0; padding-right:0;
} }
} }
@mixin uw-full-width { @mixin uw-full-width {
max-width: 100%; max-width: 100%;
padding: 0; padding: 0;
......
...@@ -381,55 +381,47 @@ $gesso: ( ...@@ -381,55 +381,47 @@ $gesso: (
), ),
display: ( display: (
display: ( display: (
color: #000,
font-family: 'georgia, "droid serif", "Times New Roman", Times, serif', font-family: 'georgia, "droid serif", "Times New Roman", Times, serif',
font-size: 41.056px, font-size: 41.056px,
font-weight: 400, font-weight: 400,
), ),
h1: ( h1: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif', font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 41.056px, font-size: 41.056px,
font-weight: 400, font-weight: 400,
line-height: 1.1, line-height: 1.1,
), ),
h2: ( h2: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif', font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 28.832px, font-size: 28.832px,
font-weight: 400, font-weight: 400,
line-height: 1.1, line-height: 1.1,
), ),
h3: ( h3: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif', font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 22.784px, font-size: 22.784px,
font-weight: 400, font-weight: 400,
line-height: 1.1, line-height: 1.1,
), ),
h4: ( h4: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif', font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 20.256px, font-size: 20.256px,
font-weight: 400, font-weight: 400,
line-height: 1.1, line-height: 1.1,
), ),
h5: ( h5: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif', font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 18px, font-size: 18px,
font-weight: 400, font-weight: 400,
line-height: 1.1, line-height: 1.1,
), ),
h6: ( h6: (
color: #000,
font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif', font-family: '"BureauGrotCond Book", impact, "avenir next condensed heavy", "Droid Sans", sans-serif',
font-size: 16px, font-size: 16px,
font-weight: 400, font-weight: 400,
line-height: 1.1, line-height: 1.1,
), ),
blockquote: ( blockquote: (
color: #4e4e4e,
font-family: 'georgia, "droid serif", "Times New Roman", Times, serif', font-family: 'georgia, "droid serif", "Times New Roman", Times, serif',
font-size: 22.784px, font-size: 22.784px,
font-weight: 400, font-weight: 400,
...@@ -511,4 +503,4 @@ $gesso: ( ...@@ -511,4 +503,4 @@ $gesso: (
xxl: 96px, xxl: 96px,
), ),
gutter-width: 40px, gutter-width: 40px,
); );
\ No newline at end of file
...@@ -317,48 +317,40 @@ gesso: ...@@ -317,48 +317,40 @@ gesso:
loose: 1.7 loose: 1.7
display: display:
display: display:
color: text.primary
font-family: primary.stack font-family: primary.stack
font-size: 8 font-size: 8
font-weight: regular font-weight: regular
h1: h1:
color: text.primary
font-family: condensedbook.stack font-family: condensedbook.stack
font-size: 8 font-size: 8
font-weight: regular font-weight: regular
line-height: tight line-height: tight
h2: h2:
color: text.primary
font-family: condensedbook.stack font-family: condensedbook.stack
font-size: 5 font-size: 5
font-weight: regular font-weight: regular
line-height: tight line-height: tight
h3: h3:
color: text.primary
font-family: condensedbook.stack font-family: condensedbook.stack
font-size: 3 font-size: 3
font-weight: regular font-weight: regular
line-height: tight line-height: tight
h4: h4:
color: text.primary
font-family: condensedbook.stack font-family: condensedbook.stack
font-size: 2 font-size: 2
font-weight: regular font-weight: regular
line-height: tight line-height: tight
h5: h5:
color: text.primary
font-family: condensedbook.stack font-family: condensedbook.stack
font-size: 1 font-size: 1
font-weight: regular font-weight: regular
line-height: tight line-height: tight
h6: h6:
color: text.primary
font-family: condensedbook.stack font-family: condensedbook.stack
font-size: 0 font-size: 0
font-weight: regular font-weight: regular
line-height: tight line-height: tight
blockquote: blockquote:
color: text.link
font-family: primary.stack font-family: primary.stack
font-size: 3 font-size: 3
font-weight: regular font-weight: regular
......
{% set date_modifier_classes -%} {% set date_modifier_classes -%}
uw-date uw-date--{{ date_format|replace({'-' : '_'})}} {{ date_modifier_classes }} uw-date {{ date_modifier_classes }}
{%- endset %} {%- endset %}
{% if is_demo %} {% if is_demo %}
<div class='uw-date-pl'> <div class='uw-date-pl'>
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
{% if is_demo %} {% if is_demo %}
</div> </div>
{% endif %} {% endif %}
\ No newline at end of file
...@@ -20,13 +20,6 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat' ...@@ -20,13 +20,6 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
font-size: gesso-font-size(-1); font-size: gesso-font-size(-1);
padding: rem(gesso-spacing(xs)) rem(gesso-spacing(sm)); padding: rem(gesso-spacing(xs)) rem(gesso-spacing(sm));
text-transform: uppercase; text-transform: uppercase;
&--long_date{}
&--long_date_time{}
&--medium_date{}
&--medium_date_time{}
&--short_date{}
&--short_date_time{}
} }
@each $faculty in $faculties { @each $faculty in $faculties {
...@@ -42,7 +35,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat' ...@@ -42,7 +35,7 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
} }
@else { @else {
background-color:gesso-brand($faculty,'primary'); background-color:gesso-brand($faculty,'primary');
color: gesso-brand($faculty, 'lvl1'); color: $uw-white;
} }
} }
} }
......
...@@ -53,7 +53,6 @@ $faculties: 'neutral', 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -53,7 +53,6 @@ $faculties: 'neutral', 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env'
.uw-cta__center-wrapper { .uw-cta__center-wrapper {
align-items: center; align-items: center;
display: inline-flex; display: inline-flex;
-ms-flex-align: center;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
...@@ -75,8 +74,18 @@ $faculties: 'neutral', 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -75,8 +74,18 @@ $faculties: 'neutral', 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env'
background-color: $uw-black; background-color: $uw-black;
border: 1px solid #fff; border: 1px solid #fff;
flex: 1 0 100%; 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{ @include small{
flex: 1 0 50%; flex: 1 0 50%;
}
@include medium{
// test
} }
@include large{ @include large{
flex: 1 0 30%; 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.banner {
.card__body { .card__body {
...@@ -10,7 +53,7 @@ ...@@ -10,7 +53,7 @@
display:none; display:none;
} }
.card__header { .card__header {
background-color: rgba(0,0,0,.8);
bottom: 0; bottom: 0;
display: block; display: block;
height: auto; height: auto;
...@@ -26,7 +69,6 @@ ...@@ -26,7 +69,6 @@
} }
.sub-title { .sub-title {
color: $uw-white;
font-family: $header-font-family; font-family: $header-font-family;
} }
...@@ -42,17 +84,12 @@ ...@@ -42,17 +84,12 @@
} }
.card__title { .card__title {
color: $uw-gold;
a { a {
color: $uw-gold;
font-family: $header-font-family; font-family: $header-font-family;
font-weight: 400; font-weight: 400;
letter-spacing: .045rem; letter-spacing: .045rem;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
} }
.card__header { .card__header {
//@include uw-contained-width(55rem);
display:grid; display:grid;
.card__title { .card__title {
...@@ -70,6 +71,7 @@ ...@@ -70,6 +71,7 @@
} }
} }
.card__footer{ .card__footer{
//@include uw-contained-width(55rem);
padding: gesso-spacing(xs) gesso-spacing(md); padding: gesso-spacing(xs) gesso-spacing(md);
} }
} }
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
.uw-node__with-image { .uw-node__with-image {
.card { .card {
.card__header { .card__header {
@include uw-contained-width; //@include uw-contained-width(55rem);
} }
.card__body { .card__body {
margin-top: -7rem; margin-top: -7rem;
...@@ -101,6 +103,7 @@ ...@@ -101,6 +103,7 @@
} }
} }
.card__footer{ .card__footer{
//@include uw-contained-width(55rem);
padding: gesso-spacing(xs) gesso-spacing(md); padding: gesso-spacing(xs) gesso-spacing(md);
}