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-5991: Text is clipped when resized #1712

Merged
merged 4 commits into from
Jan 27, 2025
Merged

SHS-5991: Text is clipped when resized #1712

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
3a25634
fix(shs-5991): remove overflow hidden to li in all scenarios, and add…
Jan 3, 2025
96a228c
feat(shs-5991): update styles to add overflow hidden in list only whe…
Jan 9, 2025
a8d2eda
feat(shs-5991): update styles to add overflow hidden in list only whe…
Jan 9, 2025
aa82c8c
Merge branch 'develop' into shs-5991-text-is-clipped-when-resized
ahughes3 Jan 24, 2025
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
8 changes: 8 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/ckeditor/imports.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,14 @@ $px-only: true;
}
}

// This prevents the list item to float behind images that are floated to the left
figure.drupal-media-style-align-left ~ ul:not([class]),
figure.drupal-media-style-align-left ~ ol:not([class]) {
li {
overflow: hidden;
}
}

// Override CK styles
.table table {
td,
Expand Down
10 changes: 10 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/elements/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@ ol:not([class]) {
@include hb-ordered-list;
}

// This prevents the list item to float behind images that are floated to the left
figure.align-left ~ ul:not([class]),
.align-left.hb-media-image ~ ul:not([class]),
figure.align-left ~ ol:not([class]),
.align-left.hb-media-image ~ ol:not([class]) {
li {
overflow: hidden;
}
}

caption:not([class]) {
font-size: hb-calculate-rems(14px);

Expand Down
6 changes: 0 additions & 6 deletions docroot/themes/humsci/humsci_basic/src/scss/tools/_mixins.general.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@
margin-bottom: hb-calculate-rems(10px);
padding-left: hb-calculate-rems(18px);

// This prevents the list item to float behind images that are floated to the left
overflow: hidden;

&::before {
content: '';
display: block;
Expand Down Expand Up @@ -169,9 +166,6 @@
margin-bottom: hb-calculate-rems(10px);
padding-left: hb-calculate-rems(38px); // should only be 18px when on a UL // was 28

// This prevents the list item to float behind images that are floated to the left
overflow: hidden;

&::before {
content: counter(li) '.';
counter-increment: li;
Expand Down
Loading