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

ISTWCMS-5633: css lint for 04-components/* , adjustments to header masthead...

ISTWCMS-5633: css lint for 04-components/* , adjustments to header masthead padding to match current
parent 84656168
No related branches found
No related tags found
1 merge request!15ISTWCMS-5633: import of website's header section
Showing
with 62 additions and 86 deletions
...@@ -9,13 +9,9 @@ ...@@ -9,13 +9,9 @@
width: 100%; width: 100%;
&__wrapper { &__wrapper {
@include uw-contained-width(); @include uw-contained-width();
padding: var(--size-2);
@media(min-width: $screen-xl) {
padding: var(--size-2) 0;
}
display: grid; display: grid;
grid-template-columns: 100%; grid-template-columns: 100%;
padding-top: var(--size-1); padding: var(--size-2);
text-size-adjust: none; text-size-adjust: none;
@media(min-width: $screen-xs) { @media(min-width: $screen-xs) {
grid-template-columns: 50% 50%; grid-template-columns: 50% 50%;
...@@ -49,7 +45,6 @@ ...@@ -49,7 +45,6 @@
font-size: var(--font-size-00); font-size: var(--font-size-00);
} }
} }
&__menu { &__menu {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
grid-column: 1 / 3; grid-column: 1 / 3;
...@@ -63,7 +58,6 @@ ...@@ -63,7 +58,6 @@
grid-row: 1 / 2; grid-row: 1 / 2;
} }
} }
&__social { &__social {
grid-column: 1 / 3; grid-column: 1 / 3;
grid-row: 3 / 4; grid-row: 3 / 4;
......
...@@ -10,7 +10,7 @@ $site-name-bg: var(--gray-2); ...@@ -10,7 +10,7 @@ $site-name-bg: var(--gray-2);
font-family: var(--font-condensedbook); font-family: var(--font-condensedbook);
margin-bottom: 0; margin-bottom: 0;
min-height: var(--size-7); min-height: var(--size-7);
padding: var(--size-1); padding: var(--size-1) 0;
position: relative; position: relative;
transition: margin 300ms; transition: margin 300ms;
&.open{ &.open{
...@@ -18,7 +18,7 @@ $site-name-bg: var(--gray-2); ...@@ -18,7 +18,7 @@ $site-name-bg: var(--gray-2);
transition: margin 300ms; transition: margin 300ms;
} }
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
@include layout-constrain; @include uw-contained-width;
min-height: inherit; min-height: inherit;
padding: var(--size-2); padding: var(--size-2);
} }
...@@ -37,7 +37,7 @@ $site-name-bg: var(--gray-2); ...@@ -37,7 +37,7 @@ $site-name-bg: var(--gray-2);
align-self: flex-end; align-self: flex-end;
} }
.uw-header-searchbar{ .uw-header-searchbar{
@include layout-constrain; @include uw-contained-width;
display: block; display: block;
left: 0; left: 0;
padding: 0; padding: 0;
...@@ -55,8 +55,8 @@ $site-name-bg: var(--gray-2); ...@@ -55,8 +55,8 @@ $site-name-bg: var(--gray-2);
background-color: $site-name-bg; background-color: $site-name-bg;
} }
.uw-header__center{ .uw-header__center{
@include layout-constrain; @include uw-contained-width;
border-bottom: var(--size-xs) solid var(--gray-3); border-bottom: var(--size-xs) solid var(--gray-3);
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
border-bottom: inherit; border-bottom: inherit;
} }
......
...@@ -24,5 +24,5 @@ ...@@ -24,5 +24,5 @@
} }
.pl-layout-h2 { .pl-layout-h2 {
@include layout-constrain; @include uw-contained-width;
} }
@use '../../01-core' as *; @use '../../01-core' as *;
.layout { .layout {
@include layout-constrain; @include uw-contained-width;
.uw-node__with-image .card__node & { .uw-node__with-image .card__node & {
padding: var(--size-1); padding: var(--size-1);
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} }
&.uw-contained-width { &.uw-contained-width {
@include layout-constrain; @include uw-contained-width;
padding: var(--size-1); padding: var(--size-1);
@media(min-width: $screen-xxl) { @media(min-width: $screen-xxl) {
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
} }
.block-inline-blockuw-cbl-google-maps{ .block-inline-blockuw-cbl-google-maps{
@include layout-constrain; @include uw-contained-width;
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
@include uw-full-width-margin; @include uw-full-width-margin;
...@@ -108,11 +108,11 @@ ...@@ -108,11 +108,11 @@
margin: inherit; margin: inherit;
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
@include layout-constrain; @include uw-contained-width;
} }
&.uw-contained-width { &.uw-contained-width {
@include layout-constrain; @include uw-contained-width;
margin: inherit; margin: inherit;
padding: var(--size-1); padding: var(--size-1);
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
z-index: var(--layer-header); z-index: var(--layer-header);
} }
.uw-highlighted { .uw-highlighted {
@include layout-constrain; @include uw-contained-width;
grid-column: 1 / 2; grid-column: 1 / 2;
grid-row: 2 / 3; grid-row: 2 / 3;
position: relative; position: relative;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.uw-site-footer { .uw-site-footer {
background-color: var(--uw-black-3); background-color: var(--uw-black-3);
&__wrapper { &__wrapper {
@include layout-constrain; @include uw-contained-width;
display: grid; display: grid;
grid-template-columns: 100%; grid-template-columns: 100%;
grid-template-rows: auto auto auto; grid-template-rows: auto auto auto;
......
...@@ -51,7 +51,7 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -51,7 +51,7 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env'
.uw-cta__text--small, .uw-cta__text--small,
.uw-cta__text--medium, .uw-cta__text--medium,
a { a {
color: darken(gesso-brand($faculty, 'primary'), 5%) color: darken(gesso-brand($faculty, 'primary'), 5%);
} }
} }
...@@ -123,17 +123,17 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -123,17 +123,17 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env'
.uw-cta__link { .uw-cta__link {
border: 0; border: 0;
bottom:0; bottom: 0;
display: block; display: block;
font-family:gesso-font-family(condensedbook); font-family: gesso-font-family(condensedbook);
height:100%; height: 100%;
left:0; left: 0;
min-height:6.25rem; min-height: 6.25rem;
padding: 0; padding: 0;
position:relative; position: relative;
right:0; right: 0;
text-decoration: none; text-decoration: none;
top:0; top: 0;
width: 100%; width: 100%;
&:hover { &:hover {
...@@ -142,11 +142,11 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -142,11 +142,11 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env'
} }
.uw-cta__text { .uw-cta__text {
font-family:gesso-font-family(condensedbook); font-family: gesso-font-family(condensedbook);
text-align: center; text-align: center;
&--big { &--big {
font-size:rem(gesso-font-size(3)); font-size: rem(gesso-font-size(3));
letter-spacing: 0.05rem; letter-spacing: 0.05rem;
line-height: 1.2; line-height: 1.2;
padding: 0 rem(gesso-spacing(xxs)) 0.313rem rem(gesso-spacing(xxs)); padding: 0 rem(gesso-spacing(xxs)) 0.313rem rem(gesso-spacing(xxs));
...@@ -154,7 +154,7 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -154,7 +154,7 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env'
&--medium { &--medium {
color: $uw-white; color: $uw-white;
font-size:rem(gesso-font-size(0)); font-size: rem(gesso-font-size(0));
line-height: 1.2; line-height: 1.2;
padding: 0 rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs)); padding: 0 rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs));
text-transform: uppercase; text-transform: uppercase;
...@@ -162,8 +162,8 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -162,8 +162,8 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env'
&--small { &--small {
color: $uw-white; color: $uw-white;
font-family:gesso-font-family(systemmedium); font-family: gesso-font-family(systemmedium);
font-size:rem(gesso-font-size(-2)); font-size: rem(gesso-font-size(-2));
line-height: 1; line-height: 1;
padding: 0 rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs)); padding: 0 rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs)) rem(gesso-spacing(xxs));
text-transform: uppercase; text-transform: uppercase;
...@@ -173,7 +173,6 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env' ...@@ -173,7 +173,6 @@ $faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env'
@each $faculty in $faculties { @each $faculty in $faculties {
.call-to-action-theme-#{$faculty}{ .call-to-action-theme-#{$faculty}{
display: table-cell; display: table-cell;
margin: 1px; margin: 1px;
vertical-align: middle; vertical-align: middle;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
$card-accent-border-color: var(--uw-black-primary) !default; $card-accent-border-color: var(--uw-black-primary) !default;
$card-link-color: var(--uw-black-primary) !default; $card-link-color: var(--uw-black-primary) !default;
$card-link-color-hover: var(--gray-5) !default; $card-link-color-hover: var(--gray-5) !default;
$card-meta-color: var(--gray-5) !default; $card-meta-color: var(--gray-5) !default;
$card-padding: var(--size-2) !default; $card-padding: var(--size-2) !default;
.card { .card {
...@@ -78,10 +78,8 @@ $card-padding: var(--size-2) !default; ...@@ -78,10 +78,8 @@ $card-padding: var(--size-2) !default;
.card__header{ .card__header{
@include uw-no-breakout(); @include uw-no-breakout();
margin-bottom: var(--size-3); margin-bottom: var(--size-3);
width: 100%; width: 100%;
.card__node--event & { .card__node--event & {
display: grid; display: grid;
grid-template-columns: 1fr auto; grid-template-columns: 1fr auto;
...@@ -99,7 +97,7 @@ $card-padding: var(--size-2) !default; ...@@ -99,7 +97,7 @@ $card-padding: var(--size-2) !default;
} }
.view-interact { .view-interact {
background-color: var(--uw-white-1); background-color: var(--uw-white-1);
grid-column: 2 / 3; grid-column: 2 / 3;
grid-row: 2 / 3; grid-row: 2 / 3;
margin: 0; margin: 0;
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
margin-top: 0; margin-top: 0;
.card__title { .card__title {
background: rgba(0, 0, 0, 0.50); background: rgba(0, 0, 0, 0.5);
color: #fff; color: #fff;
margin-bottom: 0; margin-bottom: 0;
margin-top: var(--size-4); margin-top: var(--size-4);
......
@use '../../../01-core' as *;
.card__teaser { .card__teaser {
@include uw-flex-grid(card); @include uw-flex-grid(card);
.views-row & { .views-row & {
height:100%; height: 100%;
} }
.uw-label { .uw-label {
display: block; display: block;
margin-top: 1rem; margin-top: var(--size-2);
} }
.card__tags { .card__tags {
...@@ -27,8 +28,8 @@ ...@@ -27,8 +28,8 @@
.card { .card {
&__image { &__image {
margin:0; margin: 0;
max-width:5rem; max-width: 5rem;
} }
&__header { &__header {
...@@ -36,25 +37,25 @@ ...@@ -36,25 +37,25 @@
grid-template-columns: auto 1fr; grid-template-columns: auto 1fr;
//grid-template-rows: minmax(3rem, auto); //grid-template-rows: minmax(3rem, auto);
.uw-image__profiles { .uw-image__profiles {
grid-column: 1/2; grid-column: 1 / 2;
grid-row: 1 / 3; grid-row: 1 / 3;
margin-right: 1rem; margin-right: var(--size-2);
} }
.card__position { .card__position {
grid-column: 2/3; grid-column: 2 / 3;
grid-row: 2/3; grid-row: 2 / 3;
} }
.card__title { .card__title {
grid-column: 2/3; grid-column: 2 / 3;
grid-row: 1/2; grid-row: 1 / 2;
margin: 0; margin: 0;
} }
} }
&__body { &__body {
grid-column: 1/3; grid-column: 1 / 3;
} }
} }
} }
......
@use '../../01-core' as *; @use '../../01-core' as *;
.uw-date { .uw-date {
width:auto; background-color: var(--uw-gold);
color: var(--uw-black);
clear: both;
display: inline-block;
font-family: var(--font-systemmedium);
font-size: var(--font-size-00);
padding: var(--size-1) var(--size-2);
text-transform: uppercase;
width: auto;
@media(min-width: $screen-lg) { @media(min-width: $screen-lg) {
margin-left:inherit; margin-left: inherit;
} }
} }
...@@ -14,27 +21,22 @@ ...@@ -14,27 +21,22 @@
.uw-date { .uw-date {
box-sizing: border-box; box-sizing: border-box;
display:block; display: block;
padding: var(--size-1) var(--size-2); padding: var(--size-1) var(--size-2);
&:first-child { &:first-child {
padding: var(--size-1) 2.75rem var(--size-1) var(--size-2); padding: var(--size-1) 2.75rem var(--size-1) var(--size-2);
} }
text-transform: uppercase; text-transform: uppercase;
} }
&[open] { &[open] {
background-color: transparent !important; background-color: transparent !important;
.card__node--event & { .card__node--event & {
margin-bottom: var(--size-4); margin-bottom: var(--size-4);
} }
position: absolute; position: absolute;
width: calc(100%); width: calc(100%);
z-index: var(--layer-content); z-index: var(--layer-content);
@media(min-width: $screen-xs) { @media(min-width: $screen-xs) {
width: inherit; width: inherit;
} }
...@@ -42,11 +44,9 @@ ...@@ -42,11 +44,9 @@
} }
.uw-date-details__summary { .uw-date-details__summary {
.uw-date { .uw-date {
background: inherit; background: inherit;
} }
background-position: right var(--size-105) center; // LTR background-position: right var(--size-105) center; // LTR
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 13px; background-size: 13px;
...@@ -54,27 +54,14 @@ ...@@ -54,27 +54,14 @@
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
padding: 0; padding: 0;
.block-uw-cbl-multi-type-list & { .block-uw-cbl-multi-type-list & {
background-position: right var(--size-1) center; // LTR background-position: right var(--size-1) center; // LTR
} }
&::-webkit-details-marker { &::-webkit-details-marker {
display: none; display: none;
} }
} }
.uw-date {
background-color: var(--uw-gold);
color: var(--uw-black);
clear: both;
display: inline-block;
font-family: var(--font-systemmedium);
font-size: var(--font-size-00);
padding: var(--size-1) var(--size-2);
text-transform: uppercase;
}
@each $faculty, $colour in $faculties_colours { @each $faculty, $colour in $faculties_colours {
.#{$faculty} { .#{$faculty} {
...@@ -104,7 +91,8 @@ ...@@ -104,7 +91,8 @@
background-color: var($colour); background-color: var($colour);
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);
...@@ -122,7 +110,7 @@ ...@@ -122,7 +110,7 @@
.uw-date-details__summary{ .uw-date-details__summary{
.uw-date{ .uw-date{
background:inherit; background: inherit;
} }
@include svg-background(mobile-arrow-down-w); @include svg-background(mobile-arrow-down-w);
......
...@@ -127,7 +127,6 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -127,7 +127,6 @@ $menu-horizontal-drop-bg: #f7f7f7;
.house{ .house{
fill: var(--uw-white); fill: var(--uw-white);
} }
} }
&:focus{ &:focus{
svg{ svg{
...@@ -155,7 +154,7 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -155,7 +154,7 @@ $menu-horizontal-drop-bg: #f7f7f7;
.menu--horizontal { .menu--horizontal {
> .is-active-trail { > .is-active-trail {
background-color: var(--gray-3); background-color: var(--gray-3);
color: var(--uw-black); color: var(--uw-black);
> .menu__link.active{ > .menu__link.active{
~ .menu{ ~ .menu{
.menu__item{ .menu__item{
...@@ -200,10 +199,10 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -200,10 +199,10 @@ $menu-horizontal-drop-bg: #f7f7f7;
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;
} }
&:hover{ &:hover{
background-color:inherit; background-color: inherit;
border-bottom: var(--size-xs) solid var(--gray-3); border-bottom: var(--size-xs) solid var(--gray-3);
color: var(--uw-black); color: var(--uw-black);
} }
...@@ -213,7 +212,6 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -213,7 +212,6 @@ $menu-horizontal-drop-bg: #f7f7f7;
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);
} }
} }
} }
} }
...@@ -255,7 +253,7 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -255,7 +253,7 @@ $menu-horizontal-drop-bg: #f7f7f7;
stroke-width: 0.5; stroke-width: 0.5;
} }
.house{ .house{
stroke:none !important; stroke: none !important;
} }
} }
} }
...@@ -402,7 +400,6 @@ $menu-horizontal-drop-bg: #f7f7f7; ...@@ -402,7 +400,6 @@ $menu-horizontal-drop-bg: #f7f7f7;
z-index: inherit; z-index: inherit;
} }
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
//@include uw-contained-width;
background-color: #f7f7f7; background-color: #f7f7f7;
box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1), 0 6px 6px rgba(0, 0, 0, 0.13); box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1), 0 6px 6px rgba(0, 0, 0, 0.13);
break-inside: avoid; break-inside: avoid;
......
...@@ -2,6 +2,5 @@ picture { ...@@ -2,6 +2,5 @@ picture {
img { img {
width: 100%; width: 100%;
} }
width: 100%; width: 100%;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment