Skip to content
Snippets Groups Projects
Commit 96b91fb6 authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-5940-m26lebla-links-regression' into '1.0.x' 

ISTWCMS-5940 css to correct the link regression

See merge request !52
parents bc5fb5bb b716f5f7
No related branches found
No related tags found
1 merge request!52ISTWCMS-5940 css to correct the link regression
Hide whitespace changes
Inline Side-by-side
Showing
with 252 additions and 62 deletions
src/patterns/01-core/elements/_inline-elements.scss
+ 21
− 21
View file @ 96b91fb6
...@@ -9,27 +9,27 @@ ...@@ -9,27 +9,27 @@
transition-property: background-color, border-color, color, outline-color, text-decoration-color; transition-property: background-color, border-color, color, outline-color, text-decoration-color;
transition-timing-function: var(--ease-in-out-2); transition-timing-function: var(--ease-in-out-2);
&:where([href]) { //&:where([href]) {
color: var(--gray-6); // color: var(--gray-6);
text-decoration-color: var(--gray-1); // text-decoration-color: var(--gray-1);
//
&:where(:hover) { // &:where(:hover) {
color: var(--uw-black); // color: var(--uw-black);
text-decoration-color: var(--uw-black); // text-decoration-color: var(--uw-black);
} // }
&:where(:focus) { // &:where(:focus) {
color: var(--uw-black); // color: var(--uw-black);
text-decoration-color: var(--uw-black); // text-decoration-color: var(--uw-black);
} // }
&:where(:visited) { // &:where(:visited) {
color: var(--gray-6); // color: var(--gray-6);
text-decoration-color: var(--gray-6); // text-decoration-color: var(--gray-6);
} // }
} //}
&:where(:not(:hover)) { //&:where(:not(:hover)) {
text-decoration: inherit; // text-decoration: inherit;
} //}
@media print { @media print {
&, &,
......
src/patterns/03-layouts/site-footer/_site-footer.scss
+ 0
− 10
View file @ 96b91fb6
...@@ -18,16 +18,6 @@ ...@@ -18,16 +18,6 @@
} }
&__title { &__title {
color: var(--uw-white-1); color: var(--uw-white-1);
a{
color: var(--uw-white-1);
text-decoration: underline;
&:hover,
&:focus
{
color: var(--uw-white-1);
text-decoration: none;
}
}
//font-family: gesso-font-family(condensedbook); //font-family: gesso-font-family(condensedbook);
//font-size: rem(gesso-font-size(3)); //font-size: rem(gesso-font-size(3));
grid-column: 1 / 2; grid-column: 1 / 2;
......
src/patterns/04-components/_index.scss
+ 1
− 0
View file @ 96b91fb6
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
@forward 'icon/icon--button/icon--button'; @forward 'icon/icon--button/icon--button';
@forward 'image/image'; @forward 'image/image';
@forward 'image-gallery/image-gallery'; @forward 'image-gallery/image-gallery';
@forward 'links/links';
@forward 'mailchimp/mailchimp'; @forward 'mailchimp/mailchimp';
@forward 'mailman-subscription/mailman-subscription'; @forward 'mailman-subscription/mailman-subscription';
@forward 'menu/menu'; @forward 'menu/menu';
......
src/patterns/04-components/card/_card.scss
+ 0
− 14
View file @ 96b91fb6
...@@ -125,13 +125,6 @@ $card-padding: var(--size-2) !default; ...@@ -125,13 +125,6 @@ $card-padding: var(--size-2) !default;
margin: 0 0 var(--size-1) 0; margin: 0 0 var(--size-1) 0;
padding: 0; padding: 0;
width: 100%; width: 100%;
a {
@include link-reverse(
var(--uw-black-primary),
var(--uw-black-primary)
);
}
} }
.card__author { .card__author {
...@@ -140,13 +133,6 @@ $card-padding: var(--size-2) !default; ...@@ -140,13 +133,6 @@ $card-padding: var(--size-2) !default;
font-size: var(--font-size-00); font-size: var(--font-size-00);
margin-top: 0; margin-top: 0;
padding: 0 0 var(--size-1) 0; padding: 0 0 var(--size-1) 0;
a {
@include link(
var(--uw-black-primary),
var(--uw-black-primary)
);
}
} }
// body // body
......
src/patterns/04-components/links/_links.scss 0 → 100644
+ 221
− 0
View file @ 96b91fb6
@use '../../01-core' as *;
@each $faculty, $colour in $faculties_colours {
.#{$faculty} {
// If the UW branding group
@if $faculty == org-default {
// Generic links
a {
@include link(
var(--uw-black),
var(--gray-5)
);
&.button {
@include link-no-underline(
var(--uw-white),
var(--gray-5)
);
}
&.uw-site-name__link {
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
&.tag {
@include link-reverse(
var(--gray-5),
var(--gray-5)
);
}
}
.card__title a{
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
.menu--uw-footer li a{
@include link-reverse(
var(--uw-white),
var(--uw-gold)
);
}
.uw-site-footer__content a,
.uw-site-footer__title a{
@include link(
var(--uw-white),
var(--uw-white)
);
}
.uw-site-footer__content table a{
@include link(
var(--uw-black),
var(--uw-black)
);
}
.uw-site-footer__social-media a {
@include link(
var(--uw-gray),
var(--uw-gray)
);
}
.uw-footer__social-directory a{
@include link-reverse(
var(--uw-gold),
var(--uw-white)
);
}
.views-exposed-form a,
.uw-site-name__link,
.layout-builder__link,
.tabs a,
.timeline-info__withlink a,
.ui-dialog-content a,
.messages--status a,
.uw-content-moderation a,
.view-interact a{
@include link-no-underline(
var(--uw-black),
var(--uw-black)
);
}
.toolbar-tray a{
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
.uw-footer-phone a,
.uw-territorial a{
@include link-reverse(
var(--uw-gold),
var(--uw-gold)
);
}
.tabs a{
@include link-no-underline(
var(--uw-black),
var(--uw-black)
);
}
.pager__item a{
&:hover,
&:focus{
color: var(--uw-black) !important;
}
}
.uw-site-footer__content .highlight{
color: var(--uw-white);
}
}
// Else run the loop on the faculties.
@else {
// Generic links.
a{
@include link(
var(--#{$colour}-primary),
var(--#{$colour}-primary)
);
// Links as buttons need white.
&.button {
@include link-no-underline(
var(--uw-white),
var(--gray-5)
);
}
&.pager__link {
color: var(--uw-black);
}
&.uw-site-name__link {
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
&.tag {
@include link-reverse(
var(--#{$colour}-primary),
var(--#{$colour}-primary)
);
}
}
.card__title a{
@include link-reverse(
var(--#{$colour}-primary),
var(--#{$colour}-primary)
);
}
.menu--uw-footer li a{
@include link-reverse(
var(--uw-white),
var(--uw-gold)
);
}
.uw-site-footer__content a,
.uw-site-footer__title a{
@include link(
var(--uw-white),
var(--uw-white)
);
}
.uw-site-footer__content table a{
@include link(
var(--uw-black),
var(--uw-black)
);
}
.uw-site-footer__social-media a {
@include link(
var(--gray-5),
var(--gray-5)
);
}
.uw-footer__social-directory a{
@include link-reverse(
var(--uw-gold),
var(--uw-white)
);
}
.uw-footer-phone a,
.uw-territorial a{
@include link-reverse(
var(--uw-gold),
var(--uw-gold)
);
}
// Blackout the link
.views-exposed-form a,
.uw-site-name__link,
.layout-builder__link,
.tabs a,
.timeline-info__withlink a,
.ui-dialog-content a,
.messages--status a,
.uw-content-moderation a,
.view-interact a{
@include link-no-underline(
var(--uw-black),
var(--uw-black)
);
}
.toolbar-tray a{
@include link-reverse(
var(--uw-black),
var(--uw-black)
);
}
.uw-site-footer__content .highlight{
color: var(--uw-white);
}
// MAke primary color.
.uw-blockquote__text,
.uw-blockquote__text::before,
.uw-blockquote__text::after,
.uw-blockquote__attribution,
.uw-blockquote__attribution cite{
color: var(--#{$colour}-primary);
}
}
}
}
src/patterns/04-components/site-name/_site-name.scss
+ 0
− 8
View file @ 96b91fb6
...@@ -6,13 +6,6 @@ $site-name-font-size: var(--font-size-5); ...@@ -6,13 +6,6 @@ $site-name-font-size: var(--font-size-5);
$site-slogan-font-size: var(--font-size-2); $site-slogan-font-size: var(--font-size-2);
.uw-site-name { .uw-site-name {
a {
color: var(--uw-black);
&:hover{
text-decoration: underline;
}
}
&__wrapper { &__wrapper {
padding: 0 var(--size-1); padding: 0 var(--size-1);
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
...@@ -23,7 +16,6 @@ $site-slogan-font-size: var(--font-size-2); ...@@ -23,7 +16,6 @@ $site-slogan-font-size: var(--font-size-2);
&__link { &__link {
display: inline-block; display: inline-block;
letter-spacing: inherit; letter-spacing: inherit;
text-decoration: none;
text-transform: uppercase; text-transform: uppercase;
} }
......
src/patterns/04-components/timeline/_timeline.scss
+ 9
− 9
View file @ 96b91fb6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.vertical-timeline { .vertical-timeline {
font-family: var(--font-secondary); font-family: var(--font-secondary);
font-size: var(--font-size-1); font-size: var(--font-size-00);
font-weight: 200; font-weight: 200;
list-style: none; list-style: none;
/* 2 padding-top to allow pulling the line up above the first entry */ /* 2 padding-top to allow pulling the line up above the first entry */
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
@media(min-width: $screen-md) { @media(min-width: $screen-md) {
margin: 0; margin: 0;
} }
p{
p {
font-family: var(--font-secondary);
font-size: var(--font-size-1);
margin-top: var(--size-1); margin-top: var(--size-1);
} }
p,
a { ul,
text-decoration: none; ol,
{
font-family: var(--font-secondary);
font-size: var(--font-size-00);
} }
li { li {
margin: 0; margin: 0;
padding: 0; padding: 0;
......
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