Visitar URL original
Links: Use add-color-icon mixin with currentColor for external link by aduth · Pull Request #4297 · uswds/uswds · GitHub
Skip to content

Links: Use add-color-icon mixin with currentColor for external link #4297

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

Merged
thisisdano merged 4 commits into from
Sep 23, 2021
Merged

Links: Use add-color-icon mixin with currentColor for external link #4297

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
837f00f
Use add-color-icon mixin with currentColor for external link
aduth Aug 25, 2021
2e4fe16
Extract icon-object to variable
aduth Sep 7, 2021
872dc9e
Use named syntax for contrast-bg
aduth Sep 7, 2021
bbf2d30
Restore launch--white.svg
aduth Sep 20, 2021
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
1 change: 0 additions & 1 deletion src/img/usa-icons-bg/launch--blue-60v.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/img/usa-icons-bg/launch--blue-70v.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/img/usa-icons-bg/launch--gray-5.svg
View file
Open in desktop

This file was deleted.

25 changes: 12 additions & 13 deletions src/stylesheets/core/mixins/_external-link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
@mixin external-link(
$external-link,
$external-link-hover,
$image-path: $theme-image-path
) {
$external-link-size: 1.75ex;

$icon-object: (
"name": "launch",
"color": currentColor,
"height": $external-link-size,
"svg-height": 24,
"svg-width": 24,
);

@mixin external-link($contrast-bg: "default") {
&::after {
$external-link-size: 1.75ex;
background-image: url("#{$image-path}/#{$external-link}.svg");
background-repeat: no-repeat;
background-size: 100%;
@include add-color-icon($icon-object, $contrast-bg);
content: "";
height: $external-link-size;
margin-left: units(2px);
Expand All @@ -17,8 +20,4 @@
padding-left: $external-link-size;
vertical-align: middle;
}

&:hover::after {
@include add-background-svg("#{$external-link-hover}", $image-path);
}
}
2 changes: 1 addition & 1 deletion src/stylesheets/core/mixins/_icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
// Mask supported styles
@supports (mask: url("")) {
background: none;
background-color: color($color);
background-color: if($color == currentColor, $color, color($color));
mask: $mask-props;
@if $color-hover {
&:hover {
Expand Down
10 changes: 2 additions & 8 deletions src/stylesheets/elements/typography/_links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@
// [href^='https:']:not([href*='my-domain.com'])

.usa-link--external {
@include external-link(
usa-icons-bg/launch--blue-60v,
usa-icons-bg/launch--blue-70v
);
@include external-link();

&.usa-link--alt {
@include external-link(
usa-icons-bg/launch--gray-5,
usa-icons-bg/launch--white
);
@include external-link($contrast-bg: "base-darker");
}
}