Skip to content
GitLab
Commit ba9a8327 authored by wodby's avatar wodby
Browse files

some css for faculty color changes

parent 5f928d7a
Expand all Hide whitespace changes
Inline Side-by-side
css/styles.css
View file @ ba9a8327
This diff is collapsed.
css/styles.min.css
View file @ ba9a8327
This source diff could not be displayed because it is too large. You can view the blob instead.
css/uw-dashboards.min.css
View file @ ba9a8327
This diff is collapsed.
js/component_scripts.min.js
View file @ ba9a8327
......@@ -580,18 +580,6 @@ else {
};
})(jQuery, Drupal);
/**
* @file
*/
(function ($, document, Drupal) {
Drupal.behaviors.wcmsheadersearchbar = {
attach: function (context, settings) {
}
}
})(jQuery, document, Drupal);
/**
* @file
*/
......@@ -640,6 +628,18 @@ else {
}
})(jQuery, document, Drupal);
/**
* @file
*/
(function ($, document, Drupal) {
Drupal.behaviors.wcmsheadersearchbar = {
attach: function (context, settings) {
}
}
})(jQuery, document, Drupal);
/**
* @file
*/
......
source/_data/design-tokens.artifact.yml
View file @ ba9a8327
......@@ -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
......
source/_patterns/00-config/01-mixins/_mixins.uw.scss
View file @ ba9a8327
......@@ -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;
......
source/_patterns/00-config/_design-tokens.artifact.scss
View file @ ba9a8327
......@@ -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,
......@@ -511,4 +503,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
);
);
\ No newline at end of file
source/_patterns/00-config/config.design-tokens.yml
View file @ ba9a8327
......@@ -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
......
source/_patterns/02-base/date-formats/_date-format.twig
View file @ ba9a8327
{% 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 %}
source/_patterns/02-base/date-formats/_date-formats.scss
View file @ ba9a8327
......@@ -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;
}
}
}
......
source/_patterns/04-components/call-to-action/_call-to-action.scss
View file @ ba9a8327
......@@ -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%;
......
source/_patterns/04-components/card/card--banner/_card--banner.scss
View file @ ba9a8327
$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;
font-family: $header-font-family;
}
......@@ -42,17 +84,12 @@
}
.card__title {
color: $uw-gold;
a {
color: $uw-gold;
font-family: $header-font-family;
font-weight: 400;
letter-spacing: .045rem;
text-align: center;
text-decoration: none;
&:hover {
text-decoration: underline;
}
......
source/_patterns/04-components/card/card--node/_card--node.scss
View file @ ba9a8327
......@@ -55,6 +55,7 @@
}
.card__header {
//@include uw-contained-width(55rem);
display:grid;
.card__title {
......@@ -70,6 +71,7 @@
}
}
.card__footer{
//@include uw-contained-width(55rem);
padding: gesso-spacing(xs) gesso-spacing(md);
}
}
......@@ -77,7 +79,7 @@
.uw-node__with-image {
.card {
.card__header {
@include uw-contained-width;
//@include uw-contained-width(55rem);
}
.card__body {
margin-top: -7rem;
......@@ -101,6 +103,7 @@
}
}
.card__footer{
//@include uw-contained-width(55rem);
padding: gesso-spacing(xs) gesso-spacing(md);
}
}
......
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