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 5130 Use <hr> when there is no color band text #1398

Merged
merged 4 commits into from
Nov 21, 2023
Merged

SHS 5130 Use <hr> when there is no color band text #1398

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89e6b9e
fix(shs-5130): adding hr tag when there is no color band text
mndonx Nov 18, 2023
732bda7
fix(SHS-5130): hr adjustments
mndonx Nov 20, 2023
a8fce14
build(SHS-5130): fixing conflicts with base branch
mndonx Nov 20, 2023
bacf9b0
fix(SHS-5130): hr margins and another instance
mndonx Nov 21, 2023
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/_pattern.color-band.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,8 @@
padding: hb-calculate-rems(20px);
}
}

hr {
border: 0;
Copy link
Collaborator

Choose a reason for hiding this comment

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

@mndonx We're almost there, just a little extra thing to fix. The top and bottom margin is different in the hr. There are not explicit rules in the theme for that, but the browser is adding some default styles. I checked in multiple browsers and it's consistent, so it should be fixed adding this to the hr styles:

margin-block-start: 0.83em;
margin-block-end: 0.83em;
font-size: 3.6rem;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cienvaras Good eye, thank you! I also found another instance where the logic needed to be applied (in the original pattern.) Let me know if you spot anything else. Thank you!

}
}
8 changes: 6 additions & 2 deletions ...umsci_basic/templates/components/pattern-color-band--layout--paragraph--preview.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
{%- set attributes = attributes.addClass(classes) -%}

{% if variant %}
{% set variant_class = "hb-color-band--#{variant}" %}
{% set variant_class = "hb-color-band--#{variant}" %}
{% set attributes = attributes.addClass(variant_class) %}
{% endif %}

<div{{ attributes }}>
<h2 class="hb-color-band--text">{{ color_band_text }}</h2>
{% if color_band_text %}
<h2 class="hb-color-band--text">{{ color_band_text }}</h2>
{% else %}
<hr class="hb-color-band--text" />
{% endif %}
</div>
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.

3 changes: 2 additions & 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.