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-5182: Warbler button styles/utility class button styles update #1437

Merged
merged 4 commits into from
Jan 26, 2024
Merged

SHS-5182: Warbler button styles/utility class button styles update #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94b56c5
fix(shs-5182): fix button styles in warbler color scheme
cienvaras Jan 24, 2024
8d68aac
fix(shs-5182): update sass to match coding standards
cienvaras Jan 25, 2024
4b14eb9
Merge branch 'fk-stnfd-sprint-42' of github.com:SU-HSDO/suhumsci into…
cienvaras Jan 25, 2024
0d68177
fix(shs-5182): fix hs-secondary-button focus styles
cienvaras Jan 25, 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.

12 changes: 12 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ $buttons: (
.hb-dark-inversion .views-element-container & {
@include hb-global-color('color', 'white');
}

@include hb-traditional {
.ht-pairing-warbler & {
color: white !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing you had no other option but to use !important here... this site is so hard for overrides.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, overrides in this case are hard, the clases used for setting the colors are really specific 🤷🏽‍♂️

}
}
}
}

Expand Down Expand Up @@ -65,6 +71,12 @@ button.more-link,
.hb-dark-inversion .views-element-container & {
@include hb-global-color('color', 'white');
}

@include hb-traditional {
.ht-pairing-warbler &:hover {
color: white !important;
}
}
}

// This adds margin to the top of more link which is needed for hb-grid views
Expand Down
10 changes: 10 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/elements/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ table {

thead th {
@include table-heading;

.ht-pairing-warbler & {
a {
color: white !important;
}

a:hover {
color: #e8e9ea !important;
}
}
}

thead tr {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -157,7 +157,7 @@
.hb-table-wrap &,
.hb-columns &,
.hb-timeline-item__heading &,
.views-field:not(.views-field-title):not(.views-field-edit-node):not(.views-field-field-hs-event-series):not(.views-field-field-hs-news-categories):not(.views-field-field-hs-person-research) :not(.hs-button) & {
.views-field:not(.views-field-title):not(.views-field-edit-node):not(.views-field-field-hs-event-series):not(.views-field-field-hs-news-categories):not(.views-field-field-hs-person-research) & {
.ht-pairing-warbler & {
@include hb-pairing-color('color', 'secondary');

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.