Skip to content
This repository has been archived by the owner on Nov 10, 2021. It is now read-only.

[RHDX-227] Fix visited color #3490

Merged
merged 2 commits into from
Feb 4, 2020
Merged

[RHDX-227] Fix visited color #3490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62bbb5d
fix visited color
alistairmc Feb 3, 2020
c713ba8
fix horizontal nav
alistairmc Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .../drupal-filesystem/web/themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
//hidden classes
%link {
text-decoration: var(--pf-theme--link--text-decoration, "underline");
color: var(--pfe-theme--color--ui-link, #0066cc);
color: var(--pfe-theme--color--ui-link, $link-color);
&:visited {
color: var(--pfe-theme--color--ui-link, $link-color);
}

:hover {
color: var(--pfe-theme--color--ui-link--hover, #004080)
&:hover, &:active {
color: var(--pfe-theme--color--ui-link--hover, $link-color-hover)
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...system/web/themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/_pf4-custom-globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@
font-weight: var(--pf-global--link--FontWeight);
color: var(--pf-global--link--Color);
text-decoration: var(--pf-global--link--TextDecoration);

&:visited, &:active {
color: var(--pf-global--link--Color);
}
&:hover {
--pf-global--link--Color: var(--pf-global--link--Color--hover);
--pf-global--link--TextDecoration: var(--pf-global--link--TextDecoration--hover);
Expand Down
3 changes: 2 additions & 1 deletion ...al-filesystem/web/themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/colors/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ $congress-blue: #004080;
$light-gray: #EDEDED;
$soft-dark: rgba(0,0,0,.8);


$link-color: $science-blue;
$link-color-hover: $congress-blue;
93 changes: 64 additions & 29 deletions ...system/web/themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@


:root {
--rhd-c-button--m-heavy--Color: #fff;
--rhd-c-button--m-heavy--active--Color: #fff;
--rhd-c-button--m-heavy--hover--Color: #fff;
--rhd-c-button--m-heavy--BackgroundColor: #ee0000;
--rhd-c-button--m-heavy--hover--BackgroundColor: #cf0000;
--rhd-c-button--m-heavy--active--BackgroundColor: #cf0000;
Expand Down Expand Up @@ -74,14 +77,17 @@
}

.pf-c-button {

//link button
&.pf-m-link {
color: var(--rhd-c-button--m-link--Color);
background-color: transparent;
@media screen and (max-width: $pf-global--breakpoint--sm) {
text-align: left;
}
&:visited {
color: var(--rhd-c-button--m-link--Color);
}

&:hover,
&:focus,
&.pf-m-active,
Expand All @@ -99,11 +105,13 @@
&>i,
&>.svg-inline--fa {
color: var(--rhd-c-button--m-link--Color) !important;

&:visited {
color: var(--rhd-c-button--m-link--Color) !important;
}

&:hover,
&:active,
&:focus,
&:visited {
&:focus {
color: var(--rhd-c-button--m-link--hover--Color) !important;
}
}
Expand All @@ -113,6 +121,9 @@
@media screen and (max-width: $pf-global--breakpoint--sm) {
text-align: left;
}
&:visited {
color: var(--rhd-c-button--m-link-dark--Color);
}
&:hover,
&:focus,
&.pf-m-active,
Expand All @@ -128,11 +139,12 @@
&>.pf-c-button__icon>i,
&>.pf-c-button__icon>.svg-inline--fa {
color: var(--rhd-c-button--m-link-dark--Color);

&:visited {
color: var(--rhd-c-button--m-link-dark--Color);
}
&:hover,
&:active,
&:focus,
&:visited {
&:focus {
color: var(--rhd-c-button--m-link-dark--hover--Color);
}
}
Expand All @@ -141,6 +153,10 @@
.dark & {
color: var(--rhd-c-button--m-link-dark--Color);

&:visited {
color: var(--rhd-c-button--m-link-dark--Color);
}

&:hover,
&:focus,
&.pf-m-active,
Expand All @@ -157,10 +173,12 @@
&>.pf-c-button__icon>.svg-inline--fa {
color: var(--rhd-c-button--m-link-dark--Color) !important;

&:visited {
color: var(--rhd-c-button--m-link-dark--Color) !important;
}
&:hover,
&:active,
&:focus,
&:visited {
&:focus {
color: var(--rhd-c-button--m-link-dark--hover--Color) !important;
}
}
Expand All @@ -176,6 +194,9 @@
@media screen and (max-width: $pf-global--breakpoint--sm) {
text-align: left;
}
&:visited {
color: var(--rhd-c-button--m-tertiary--Color);
}
&:hover,
&:focus,
&.pf-m-active,
Expand All @@ -191,11 +212,12 @@
&>.pf-c-button__icon>i,
&>.pf-c-button__icon>.svg-inline--fa {
color: var(--rhd-c-button--m-tertiary--Color) !important;

&:visited {
color: var(--rhd-c-button--m-tertiary--Color) !important;
}
&:hover,
&:active,
&:focus,
&:visited {
&:focus {
color: var(--rhd-c-button--m-tertiary--Color);
}
}
Expand All @@ -205,6 +227,9 @@
@media screen and (max-width: $pf-global--breakpoint--sm) {
text-align: left;
}
&:visited {
color: var(--rhd-c-button--m-secondary-dark--Color);
}
&:hover,
&:focus,
&.pf-m-active,
Expand All @@ -222,18 +247,22 @@
&>i,
&>.svg-inline--fa {
color: var(--rhd-c-button--m-secondary-dark--Color) !important;

&:visited {
color: var(--rhd-c-button--m-secondary-dark--Color) !important;
}
&:hover,
&:active,
&:focus,
&:visited {
&:focus {
color: #9D9D9D !important;
}
}
}

.dark & {
color: var(--rhd-c-button--m-secondary-dark--Color);
&:visited {
color: var(--rhd-c-button--m-secondary-dark--Color);
}
&:hover,
&:focus,
&.pf-m-active,
Expand All @@ -251,11 +280,12 @@
&>i,
&>.svg-inline--fa {
color: var(--rhd-c-button--m-secondary-dark--Color) !important;

&:visited {
color: var(--rhd-c-button--m-secondary-dark--Color) !important;
}
&:hover,
&:active,
&:focus,
&:visited {
&:focus {
color: #9D9D9D !important;
}
}
Expand All @@ -268,13 +298,16 @@
// Heavy CTA
&.pf-m-heavy {
background-color: var(--rhd-c-button--m-heavy--BackgroundColor);
color: var(--pf-global--Color--light-100);

color: var(--rhd-c-button--m-heavy--Color);
&:visited {
color: var(--rhd-c-button--m-heavy--Color);
}
&:hover,
&:focus,
&:active,
&.pf-m-active,
&:focus,
&.pf-m-focus {
color: var(--rhd-c-button--m-heavy--Color);
background-color: var(--rhd-c-button--m-heavy--active--BackgroundColor);
}

Expand All @@ -285,14 +318,17 @@
}

.dark & {
color: var(--rhd-c-button--m-secondary-dark--Color);

color: var(--rhd-c-button--m-heavy--Color);
&:visited {
color: var(--rhd-c-button--m-heavy--Color);
}
&:hover,
&:focus,
&:active,
&.pf-m-active,
&.pf-m-focus {
background-color: var(--rhd-c-button--m-heavy--active--BackgroundColor);
color: var(--pf-global--Color--light-100);
color: var(--rhd-c-button--m-heavy--Color);
}
}
}
Expand All @@ -303,7 +339,6 @@
// Primary Button
&.pf-m-primary {
background-color: var(--rhd-c-button--m-primary--BackgroundColor);

&:hover,
&:active,
&.pf-m-active,
Expand Down Expand Up @@ -570,17 +605,17 @@
}

&.heavy-cta {
@extend .pf-m-heavy;
@extend .pf-c-button.pf-m-heavy;
&.blue {
@extend .pf-m-primary;
@extend .pf-c-button.pf-m-primary;
}
}

&.medium-cta {
@extend .pf-m-secondary;
@extend .pf-c-button.pf-m-secondary;
border:none;
&.red {
@extend .pf-m-secondary-alt;
@extend .pf-c-button.pf-m-secondary-alt;
}
}
}
16 changes: 9 additions & 7 deletions ...lesystem/web/themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/components/_cards.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,30 +51,32 @@
}

.rhd-m-link {
color: #06c;
color: $link-color;
text-decoration: none;

&:hover,
&:active,
&:focus,
&:visited {
color: #004080;
&:focus {
color: $link-color-hover;

&>i,
&>.svg-inline--fa {
color: #004080 !important;
color: $link-color-hover !important;
}
}
&:visited {
color: $link-color;
}

&>i,
&>.svg-inline--fa {
color: #06c;
color: $link-color;

&:hover,
&:active,
&:focus,
&:visited {
color: #004080;
color: $link-color-hover;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions .../themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/components/_comment-list-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
}

a {
color: #06c;
color: $link-color;
text-decoration: none;
&:hover,
&:active,
&:focus,
&:visited {
color: #004080;
color: $link-color-hover;
& > i,
& > .svg-inline--fa {
color: #004080 !important;
color: $link-color-hover !important;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...l-filesystem/web/themes/custom/rhdp2/rhd-frontend/src/styles/rhd-theme/pages/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
position: relative;
top: 0.1em;
}
}
}