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-5996/SHS-5997: WYSIWYG link styles with arrow or external-link show green icon instead of matching the colour palette / WYSIWYG link style "External Link" does not show external icon #1703

Merged
merged 8 commits into from
Jan 10, 2025
Merged

SHS-5996/SHS-5997: WYSIWYG link styles with arrow or external-link show green icon instead of matching the colour palette / WYSIWYG link style "External Link" does not show external icon #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b7fa7e
fix(shs-5996-shs-5997): wysiwyg more link and external link styles
Dec 19, 2024
846d8d7
Merge branch '11.6.1-release' of github.com:SU-HSDO/suhumsci into shs…
cienvaras Dec 19, 2024
3f5e3fc
fix(shs-5996-shs-5997): move external link styles for CKEditor UI to …
Jan 2, 2025
2d4f040
fix(shs-5996-shs-5997): move external link styles for CKEditor UI to …
Jan 2, 2025
83b36e5
Merge branch 'shs-5996-5997-fix-wysiwyg-link-styles' of github.com:SU…
Jan 2, 2025
5540106
fix(shs-5996-shs-5997): add empty space at the end of the admin theme…
Jan 2, 2025
aa78801
fix(shs-5996-shs-5997): move external links to _wysiwyg-editor file
Jan 2, 2025
21e0b5f
fix(shs-5996-shs-5997): move external links to _wysiwyg-editor file
Jan 2, 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
15 changes: 15 additions & 0 deletions docroot/themes/humsci/humsci_basic/src/scss/admin/_wysiwyg-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,18 @@ drupal-media {
.ck-editor .ck.ck-toolbar.ck-toolbar_grouping > .ck-toolbar__items {
flex-wrap: wrap;
}

/* Match styles of external link in the WYSIWYG style's dropdown preview with the original design */
.ck-style-grid__button__preview a.hs-external-link {
@include hb-link--inline;
@include hb-external-link-icon;

/* Resize the icon, using px instead of rem, because when using rem the icon looks way bigger */
&::after {
width: 18px;
height: 11px;
margin-bottom: 0;
background-size: 11px;
padding-left: 0;
}
}
2 changes: 1 addition & 1 deletion docroot/themes/humsci/humsci_basic/src/scss/tools/_mixins.icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
background-image: svg(hc-get-icons($icon, $icon-color));

} @else {
$icon-color: map-get(map-get($hc-colorful-pairings, 'ocean'), $color);
$icon-color: map-get(map-get($hc-colorful-pairings, 'cardinal'), $color);
background-image: svg(hc-get-icons($icon, $icon-color));

.hc-pairing-ocean & {
Expand Down
3 changes: 1 addition & 2 deletions docroot/themes/humsci/humsci_basic/src/scss/utilities/_wysiwyg-text-area.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,7 @@ blockquote:nth-child(n) {
}

a[href*="//"].hs-external-link,
.hs-external-link a[href*="//"]
{
.hs-external-link a[href*="//"] {
@include hb-link--inline;
@include hb-external-link-icon;

Expand Down
Loading