Skip to content

buttons focus a11y fix #93

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
StephDriver wants to merge 2 commits into from
+83 −42
Closed

buttons focus a11y fix #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22bfc2a
b-#91 focus now visible
StephDriver Oct 11, 2024
bde040e
b-#91 focus behaviour now same as hover
StephDriver Oct 11, 2024
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
65 changes: 49 additions & 16 deletions themes/alpha/static/components/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,32 @@
align-items: center;
padding: var(--space-l);

& .button {
border-radius: var(--space-xl);
padding: var(--space-m);
& .button-internal {
text-decoration-line: none;
line-height: 1.1;
border: 0;
padding: var(--space-2xs);
margin: 0;
display: inline-block;

/* color pairs foreground-background*/
&.tan-on-black{color: var(--clr-tan); background-color: var(--clr-black);}
&.black-on-tan{ color: var(--clr-black); background-color: var(--clr-tan); }

&.rust-on-black{ color: var(--clr-rust); background-color: var(--clr-black); }
&.black-on-rust{ color: var(--clr-black); background-color: var(--clr-rust); }

&.tan-on-orange{ color: var(--clr-tan); background-color: var(--clr-orange); }
&.orange-on-tan{ color: var(--clr-orange); background-color: var(--clr-tan); }

&.tan-on-blue{ color: var(--clr-tan); background-color: var(--clr-blue); }
&.blue-on-tan{ color: var(--clr-blue); background-color: var(--clr-tan); }

}

& .button-shape {
border-radius: var(--space-xl);
padding: var(--space-m);

/* borders */
&.border-black { border: solid var(--clr-black) 2px; }
Expand All @@ -31,19 +52,31 @@
&.tan-on-blue{ color: var(--clr-tan); background-color: var(--clr-blue); }
&.blue-on-tan{ color: var(--clr-blue); background-color: var(--clr-tan); }

/* hover inversing color pair */
&.tan-on-black:hover{ color: var(--clr-black); background-color: var(--clr-tan); }
&.black-on-tan:hover{ color: var(--clr-tan); background-color: var(--clr-black); }

&.rust-on-black:hover{ color: var(--clr-black); background-color: var(--clr-rust); }
&.black-on-rust:hover{ color: var(--clr-rust); background-color: var(--clr-black); }

&.tan-on-orange:hover{ color: var(--clr-orange); background-color: var(--clr-tan); }
&.orange-on-tan:hover{ color: var(--clr-tan); background-color: var(--clr-orange); }

&.tan-on-blue:hover{ color: var(--clr-blue); background-color: var(--clr-tan); }
&.blue-on-tan:hover{ color: var(--clr-tan); background-color: var(--clr-blue); }
}
/* hover and focus inversing color pair */
&.tan-on-black:hover, &.tan-on-black:hover > .button-internal{ color: var(--clr-black); background-color: var(--clr-tan); }
&.black-on-tan:hover, &.black-on-tan:hover > .button-internal{ color: var(--clr-tan); background-color: var(--clr-black); }

&.rust-on-black:hover, &.rust-on-black:hover > .button-internal{ color: var(--clr-black); background-color: var(--clr-rust); }
&.black-on-rust:hover, &.black-on-rust:hover > .button-internal{ color: var(--clr-rust); background-color: var(--clr-black); }

&.tan-on-orange:hover, &.tan-on-orange:hover > .button-internal{ color: var(--clr-orange); background-color: var(--clr-tan); }
&.orange-on-tan:hover, &.orange-on-tan:hover > .button-internal{ color: var(--clr-tan); background-color: var(--clr-orange); }

&.tan-on-blue:hover, &.tan-on-blue:hover > .button-internal{ color: var(--clr-blue); background-color: var(--clr-tan); }
&.blue-on-tan:hover, &.blue-on-tan:hover > .button-internal{ color: var(--clr-tan); background-color: var(--clr-blue); }

&.tan-on-black:focus-within, &.tan-on-black:focus-within > .button-internal{ color: var(--clr-black); background-color: var(--clr-tan); }
&.black-on-tan:focus-within, &.black-on-tan:focus-within > .button-internal{ color: var(--clr-tan); background-color: var(--clr-black); }

&.rust-on-black:focus-within, &.rust-on-black:focus-within > .button-internal{ color: var(--clr-black); background-color: var(--clr-rust); }
&.black-on-rust:focus-within, &.black-on-rust:focus-within > .button-internal{ color: var(--clr-rust); background-color: var(--clr-black); }

&.tan-on-orange:focus-within, &.tan-on-orange:focus-within > .button-internal{ color: var(--clr-orange); background-color: var(--clr-tan); }
&.orange-on-tan:focus-within, &.orange-on-tan:focus-within > .button-internal{ color: var(--clr-tan); background-color: var(--clr-orange); }

&.tan-on-blue:focus-within, &.tan-on-blue:focus-within > .button-internal{ color: var(--clr-blue); background-color: var(--clr-tan); }
&.blue-on-tan:focus-within, &.blue-on-tan:focus-within > .button-internal{ color: var(--clr-tan); background-color: var(--clr-blue); }

}

}
60 changes: 34 additions & 26 deletions themes/alpha/static/components/button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,40 @@


<div class="button-container">
{% if link %}
<a href="{{link}}"
{% else %}
<button type="button" onclick="{{onclick}}"
{% endif %}

{% if labelledby %}
aria-labelledby="{{ labelledby }}"
{% elif label %}
aria-label="{{ label }}"
{% endif %}

{% if volume == "loud" %}
class="button ff-space-mono-bold {{parent_background_color}}-on-{{parent_text_color}} border-{{parent_text_color}}"
{% elif volume == "quiet" %}
class="button ff-space-mono-bold {{parent_text_color}}-on-{{parent_background_color}} border-{{parent_text_color}}"
{% endif %}
>

{{ caller() }} <span aria-hidden="true" > &#10140; </span>

{% if link %}
</a>
{% else %}
</button>
{% endif %}
<div
{% if volume == "loud" %}
class="button-shape ff-space-mono-bold {{parent_background_color}}-on-{{parent_text_color}} border-{{parent_text_color}}"
{% elif volume == "quiet" %}
class="button-shape ff-space-mono-bold {{parent_text_color}}-on-{{parent_background_color}} border-{{parent_text_color}}"
{% endif %}
>
{% if link %}
<a href="{{link}}"
{% else %}
<button type="button" onclick="{{onclick}}"
{% endif %}

{% if labelledby %}
aria-labelledby="{{ labelledby }}"
{% elif label %}
aria-label="{{ label }}"
{% endif %}

{% if volume == "loud" %}
class="button-internal ff-space-mono-bold {{parent_background_color}}-on-{{parent_text_color}} border-{{parent_text_color}}"
{% elif volume == "quiet" %}
class="button-internal ff-space-mono-bold {{parent_text_color}}-on-{{parent_background_color}} border-{{parent_text_color}}"
{% endif %}
>

{{ caller() }} <span aria-hidden="true" > &#10140; </span>

{% if link %}
</a>
{% else %}
</button>
{% endif %}
</div>

</div>

Expand Down