Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SHS 5178 Ocean color scheme link contrast adjustments #1426

Merged
merged 6 commits into from
Jan 11, 2024
Merged

SHS 5178 Ocean color scheme link contrast adjustments #1426

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4ef4db
fix(shs-5178): ocean theme contrast fixes
mndonx Dec 23, 2023
ba6e7e5
fix(shs-5178): a few more contrast fixes
mndonx Dec 28, 2023
5954b15
fix(shs-5178): limiting changes to colorful theme
mndonx Jan 11, 2024
b281b9f
Merge branch 'fk-stnfd-sprint-41' of github.com:SU-HSDO/suhumsci into…
Jan 11, 2024
47bc876
Merge branch 'SHS-5178-ocean-more-link' of github.com:SU-HSDO/suhumsc…
Jan 11, 2024
72dc035
chore(shs-5178): Update compiled css files
cienvaras Jan 11, 2024
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
2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_airy/css/humsci_airy-ckeditor.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_airy/css/humsci_airy.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/components/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,10 @@
left: 0;
}

.hc-pairing-ocean & {
@include hb-pairing-color('background-color', 'secondary-darken-12');
}

&:only-child {
position: relative;
bottom: auto;
Expand Down
4 changes: 4 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/components/_pager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
border: none;
@include hb-pairing-color('color', 'tertiary-reversed');
}

.hc-pairing-ocean & {
@include hb-pairing-color('color', 'secondary-darken-12');
}
}
}
}
Expand Down
35 changes: 35 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/tools/_mixins.buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@
box-shadow: 0 0 0 hb-calculate-rems(1px) var(--palette--secondary-active);
}
}

.hc-pairing-ocean & {
@include hb-pairing-color('background-color', 'secondary-darken-12');
@include hb-pairing-color('border-color', 'secondary-darken-12');

&:hover {
@include hb-pairing-color('background-color', 'primary-dark');
@include hb-pairing-color('border-color', 'primary-dark');
}
}
}

@mixin hb-big-button {
Expand Down Expand Up @@ -171,6 +181,16 @@
}
}
}

.hc-pairing-ocean & {
@include hb-pairing-color('border-color', 'secondary-darken-12');
@include hb-pairing-color('color', 'secondary-darken-12');

&:hover {
@include hb-global-color('color', 'white');
@include hb-pairing-color('background-color', 'secondary-darken-12');
}
}
}

@mixin hb-reset-button {
Expand Down Expand Up @@ -239,4 +259,19 @@
box-shadow: none;
}
}

.hc-pairing-ocean & {
@include hb-pairing-color('color', 'secondary-darken-12');
@include hb-pairing-color('border-bottom-color', 'secondary-darken-12');

&:hover {
@include hb-pairing-color('color', 'primary-dark');
@include hb-pairing-color('border-bottom-color', 'primary-dark');

background-color: transparent;
border-top-color: transparent;
border-left-color: transparent;
border-right-color: transparent;
}
}
}
27 changes: 27 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/tools/_mixins.links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@
}
}
}

.hc-pairing-ocean .hb-well & {
@include hb-pairing-color('color', 'primary');
}
}

// More Link Styles
Expand All @@ -232,6 +236,16 @@
background-size: 85%;
transition: hb-transition(transform);
will-change: contents;

.hc-pairing-ocean & {
@include hb-icon-link-arrow('primary');
background-size: 85%;
}

.hc-pairing-ocean .hb-well & {
@include hb-icon-link-arrow('secondary-darken-12');
background-size: 85%;
}
}

&:hover,
Expand All @@ -245,6 +259,11 @@
@include hb-icon-link-arrow('secondary-darken-12');
background-size: 85%;
transform: translateX(0.25rem);

.hc-pairing-ocean & {
@include hb-icon-link-arrow('primary-dark');
background-size: 85%;
}
}
}

Expand Down Expand Up @@ -314,6 +333,14 @@
}
}
}

.hc-pairing-ocean & {
@include hb-pairing-color('color', 'secondary-darken-12');

&:hover {
@include hb-pairing-color('color', 'primary-dark');
}
}
}

// Arrow style link for Colorful Theme
Expand Down
7 changes: 4 additions & 3 deletions docroot/themes/humsci/humsci_basic/src/scss/tools/_mixins.text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,13 @@
> p,
> div {
margin: 0;

&::before {
position: absolute;
content: open-quote;
margin-left: hb-calculate-rems(-16px);
}

&::after {
position: absolute;
content: close-quote;
Expand Down Expand Up @@ -277,7 +277,8 @@
text-transform: inherit;
@include hb-pairing-color('color', 'secondary');

.hb-well & {
.hb-well &,
.hc-pairing-ocean & {
@include hb-pairing-color('color', 'secondary-darken-12', $important: true);
}
}
Expand Down
2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_colorful/css/humsci_colorful-ckeditor.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_colorful/css/humsci_colorful.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_traditional/css/humsci_traditional-ckeditor.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_traditional/css/humsci_traditional.css
View file
Open in desktop

Large diffs are not rendered by default.