Visitar URL original
Button/Icon: Improve default appearance of button with icon by aduth · Pull Request #4493 · uswds/uswds · GitHub
Skip to content

Button/Icon: Improve default appearance of button with icon #4493

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

Closed
aduth wants to merge 3 commits into from
Closed

Button/Icon: Improve default appearance of button with icon #4493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd973bd
Improve default appearance of button with icon
aduth Feb 1, 2022
e28c4bd
Fix Prettier issues
aduth Feb 1, 2022
5abd934
Adjust horizontal margin offset
aduth Feb 7, 2022
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
6 changes: 6 additions & 0 deletions src/components/buttons/buttons.config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ label: Buttons
status: ready

variants:
- name: icon
label: Default with icon
context:
category: "icon"
content_prefix: "<svg class=\"usa-icon\" aria-hidden=\"true\" focusable=\"false\" role=\"img\"><use xlink:href=\"../../dist/img/sprite.svg#add_circle_outline\"></use></svg>"

- name: secondary
context:
category: alternate
Expand Down
12 changes: 6 additions & 6 deletions src/components/buttons/buttons.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<div class="bg-base-darkest padding-1" style="max-width: fit-content">
{% endif -%}

<button class="usa-button {{ classes }}">Default</button>
<button class="usa-button {{ classes }}">{{ content_prefix | safe }}Default</button>
{% if (category != 'disabled') and (category != 'big') -%}
<button class="usa-button {{ classes }} usa-button--hover">Hover</button>
<button class="usa-button {{ classes }} usa-button--active">Active</button>
<button class="usa-button {{ classes }} usa-focus">Focus</button>
<button class="usa-button {{ classes }}" disabled>Disabled</button>
<button class="usa-button {{ classes }} usa-button--hover">{{ content_prefix | safe }}Hover</button>
<button class="usa-button {{ classes }} usa-button--active">{{ content_prefix | safe }}Active</button>
<button class="usa-button {{ classes }} usa-focus">{{ content_prefix | safe }}Focus</button>
<button class="usa-button {{ classes }}" disabled>{{ content_prefix | safe }}Disabled</button>
{%- endif -%}
<button class="usa-button {{ classes }} usa-button--unstyled">Unstyled button</button>
<button class="usa-button {{ classes }} usa-button--unstyled">{{ content_prefix | safe }}Unstyled button</button>

{%- if (classes == 'usa-button--outline usa-button--inverse') %}
</div>
Expand Down
15 changes: 15 additions & 0 deletions src/stylesheets/components/_icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,28 @@ $tokens-icon-sizes: (
);

$icon-inline-size-magic-number: 1em;
$icon-min-padding: 1em * divide(2, 24);

.usa-icon {
display: inline-block;
fill: currentColor;
height: $icon-inline-size-magic-number;
position: relative;
width: $icon-inline-size-magic-number;

.usa-button > &:first-child {
float: left;
margin-top: -0.5 *
($icon-inline-size-magic-number - lh($theme-button-font-family, 1));
margin-bottom: -0.5 *
($icon-inline-size-magic-number - lh($theme-button-font-family, 1));
margin-right: 0.25rem;
}

.usa-button:not(.usa-button--unstyled) > &:first-child {
margin-left: -1 * $icon-min-padding;
margin-right: #{0.5em - $icon-min-padding};
}
}

@each $token, $units in $tokens-icon-sizes {
Expand Down