Skip to content
Snippets Groups Projects
Commit 5017bc3b authored by Martin Leblanc's avatar Martin Leblanc
Browse files

ISTWCMS-5633: adjustments to the color arrays

parent 2deecbbc
No related branches found
No related tags found
1 merge request!15ISTWCMS-5633: import of website's header section
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 55 deletions
src/patterns/01-core/props/_colors.scss
+ 12
− 12
View file @ 5017bc3b
...@@ -220,18 +220,18 @@ ...@@ -220,18 +220,18 @@
} }
$faculties_colours: ( $faculties_colours: (
'org-default': --uw-gold, 'org-default': uw-gold,
'org-ahs': --ahs, 'org-ahs': ahs,
'org-art': --art, 'org-art': art,
'org-eng': --eng, 'org-eng': eng,
'org-env': --env, 'org-env': env,
'org-mat': --mat, 'org-mat': mat,
'org-sci': --sci, 'org-sci': sci,
'org-school': --school, 'org-school': school,
'org-stp': --stp, 'org-stp': stp,
'org-cgc': --cgc, 'org-cgc': cgc,
'org-stj': --stj, 'org-stj': stj,
'org-ren': --ren 'org-ren': ren
); );
//Swatches //Swatches
......
src/patterns/04-components/color-bar/_color-bar.scss
+ 2
− 2
View file @ 5017bc3b
...@@ -5,8 +5,8 @@ $lvls: '1', '2', '3', '4'; ...@@ -5,8 +5,8 @@ $lvls: '1', '2', '3', '4';
@each $faculty, $colour in $faculties_colours { @each $faculty, $colour in $faculties_colours {
@each $lvl in $lvls { @each $lvl in $lvls {
.uw-colour-bar__cbar { .uw-colour-bar__cbar {
&.#{$faculty}-#{$lvl} { &.#{$colour}-#{$lvl} {
background-color: var(#{$colour}-#{$lvl}); background-color: var(--#{$colour}-#{$lvl});
} }
} }
} }
......
src/patterns/04-components/date/_date.scss
+ 6
− 6
View file @ 5017bc3b
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
@if $faculty == org-default { @if $faculty == org-default {
.uw-date { .uw-date {
background-color: var($colour); background-color: var(--#{$colour}-primary);
color: var(--uw-black); color: var(--uw-black);
} }
.uw-date-details { .uw-date-details {
background-color: var($colour); background-color: var(--#{$colour}-primary);
&[open] { &[open] {
.uw-date-details__summary { .uw-date-details__summary {
...@@ -88,18 +88,18 @@ ...@@ -88,18 +88,18 @@
} }
@include svg-background(mobile-arrow-down); @include svg-background(mobile-arrow-down);
background-color: var($colour); background-color: var(--#{$colour}-primary);
color: var(--uw-black); color: var(--uw-black);
} }
} }
@else { @else {
.uw-date { .uw-date {
background-color: var(#{$colour}-primary); background-color: var(--#{$colour}-primary);
color: var(--uw-white); color: var(--uw-white);
} }
.uw-date-details { .uw-date-details {
background-color: var(#{$colour}-primary); background-color: var(--#{$colour}-primary);
&[open] { &[open] {
.uw-date-details__summary { .uw-date-details__summary {
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
} }
@include svg-background(mobile-arrow-down-w); @include svg-background(mobile-arrow-down-w);
background-color: var(#{$colour}-primary); background-color: var(--#{$colour}-primary);
color: var(--uw-white); color: var(--uw-white);
} }
} }
......
src/patterns/04-components/menu/menu--horizontal/_menu--horizontal.scss
+ 13
− 13
View file @ 5017bc3b
...@@ -121,8 +121,8 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -121,8 +121,8 @@ $menu-horizontal-drop-bg: #f7f7f7;
.uw-site-home__link{ .uw-site-home__link{
svg{ svg{
.bg-circle{ .bg-circle{
fill: var(#{$colour}-primary); fill: var(--#{$colour}-primary);
stroke: var(#{$colour}-primary); stroke: var(--#{$colour}-primary);
} }
.house{ .house{
fill: var(--uw-white); fill: var(--uw-white);
...@@ -132,10 +132,10 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -132,10 +132,10 @@ $menu-horizontal-drop-bg: #f7f7f7;
svg{ svg{
.bg-circle{ .bg-circle{
fill: var(--uw-white); fill: var(--uw-white);
stroke: var(#{$colour}-primary); stroke: var(--#{$colour}-primary);
} }
.house{ .house{
fill: var(#{$colour}-primary); fill: var(--#{$colour}-primary);
} }
} }
} }
...@@ -143,10 +143,10 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -143,10 +143,10 @@ $menu-horizontal-drop-bg: #f7f7f7;
svg{ svg{
.bg-circle{ .bg-circle{
fill: var(--uw-white); fill: var(--uw-white);
stroke: var(#{$colour}-primary); stroke: var(--#{$colour}-primary);
} }
.house{ .house{
fill: var(#{$colour}-primary); fill: var(--#{$colour}-primary);
} }
} }
} }
...@@ -160,8 +160,8 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -160,8 +160,8 @@ $menu-horizontal-drop-bg: #f7f7f7;
.menu__item{ .menu__item{
&__parent{ &__parent{
a{ a{
border-bottom: 1px solid var(#{$colour}-primary); border-bottom: 1px solid var(--#{$colour}-primary);
color: var(#{$colour}-primary); color: var(--#{$colour}-primary);
} }
} }
} }
...@@ -191,13 +191,13 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -191,13 +191,13 @@ $menu-horizontal-drop-bg: #f7f7f7;
text-decoration: none; text-decoration: none;
&:focus { &:focus {
background-color: inherit; background-color: inherit;
border-bottom: var(--size-xs) solid var(#{$colour}-primary); border-bottom: var(--size-xs) solid var(--#{$colour}-primary);
color: var(--uw-black); color: var(--uw-black);
} }
&.active{ &.active{
background-color: inherit; background-color: inherit;
border-bottom: var(--size-xs) solid var(#{$colour}-primary); border-bottom: var(--size-xs) solid var(--#{$colour}-primary);
color: var(#{$colour}-primary); color: var(--#{$colour}-primary);
&::after{ &::after{
display: none; display: none;
} }
...@@ -209,8 +209,8 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -209,8 +209,8 @@ $menu-horizontal-drop-bg: #f7f7f7;
} }
&:hover{ &:hover{
background-color: inherit; background-color: inherit;
border-bottom: var(--size-xs) solid var(#{$colour}-primary); border-bottom: var(--size-xs) solid var(--#{$colour}-primary);
color: var(#{$colour}-primary); color: var(--#{$colour}-primary);
} }
} }
} }
......
src/patterns/04-components/site-name/_site-name.scss
+ 1
− 1
View file @ 5017bc3b
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Styles for Site name. // Styles for Site name.
@use '../../01-core' as *; @use '../../01-core' as *;
$site-name-font-family: var(--gray-2);
$site-name-font-size: var(--font-size-5); $site-name-font-size: var(--font-size-5);
.uw-site-name { .uw-site-name {
a{ a{
color: var(--uw-black);
&:hover{ &:hover{
text-decoration: underline; text-decoration: underline;
} }
......
src/patterns/04-components/tag/_tag.scss
+ 19
− 21
View file @ 5017bc3b
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
@use '../../01-core' as *; @use '../../01-core' as *;
$faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat', 'org-sci', 'org-school', 'org-stp', 'org-cgc', 'org-stj', 'org-ren';
$tag-font-family-small: var(--font-systemmedium) !default; $tag-font-family-small: var(--font-systemmedium) !default;
$tag-font-family-normal: var(--font-systembold) !default; $tag-font-family-normal: var(--font-systembold) !default;
$tag-font-size-normal: var(--font-size-00) !default; $tag-font-size-normal: var(--font-size-00) !default;
...@@ -104,8 +103,7 @@ $tag-font-size-small: var(--font-size-0000) !default; ...@@ -104,8 +103,7 @@ $tag-font-size-small: var(--font-size-0000) !default;
transition: background 300ms ease; transition: background 300ms ease;
} }
} }
@each $faculty, $colour in $faculties_colours {
@each $faculty in $faculties {
.#{$faculty} { .#{$faculty} {
a.tag--full{ a.tag--full{
@if $faculty == org-default { @if $faculty == org-default {
...@@ -117,24 +115,24 @@ $tag-font-size-small: var(--font-size-0000) !default; ...@@ -117,24 +115,24 @@ $tag-font-size-small: var(--font-size-0000) !default;
color: var(--uw-black-primary); color: var(--uw-black-primary);
} }
} }
//@else if $faculty == org-stp or $faculty == org-stj or $faculty == org-ren or $faculty == org-cgc{ @else if $faculty == org-stp or $faculty == org-stj or $faculty == org-ren or $faculty == org-cgc{
// background-color:gesso-brand($faculty,'primary'); background-color: var(--#{$colour}-primary);
// color: gesso-brand(org-default,uw-white,'primary'); color: var(--uw-white);
// &:hover, &:hover,
// &:focus { &:focus {
// background-color: gesso-brand($faculty, 'light'); background-color: var(--#{$colour}-light);
// color:gesso-brand($faculty,'primary'); color: var(--#{$colour}-primary);
// } }
//} }
//@else { @else {
// background-color:gesso-brand($faculty,'primary'); background-color: var(--#{$colour}-primary);
// color: gesso-brand(org-default,uw-white,'primary'); color: var(--uw-white);
// &:hover, &:hover,
// &:focus { &:focus {
// background-color: gesso-brand($faculty, 'lvl1'); background-color: var(--#{$colour}-primary);
// color:gesso-brand($faculty,'primary'); color: var(--#{$colour}-primary);
// } }
//} }
} }
} }
} }
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