Skip to content

Made the language and documentation version switcher accessible by keyboard. #2347

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

Open
sarahboyce wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Made the language and documentation version switcher accessible by keyboard. #2347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
130 changes: 69 additions & 61 deletions djangoproject/scss/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,88 +2286,96 @@ h2+.list-link-soup {
z-index: 1;
pointer-events: none;

list-style: none;

.icon {
margin-right: 4px;
}
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 0.6em;

ul {
text-align: right;
margin: 0;
padding: 0;
list-style: none;
display: inline-flex;
align-items: center;
justify-content: flex-end;
gap: 3px;
}
}

#doc-versions,
#doc-languages,
#faq-link,
#backtotop-link {
margin: 0;
padding-top: 0.25em;
padding-bottom: 0.25em;

&.open {
li {
display: inline-block;
#doc-versions li,
#doc-languages li,
#faq-link li,
#backtotop-link li {
margin: 0 3px;
background: var(--body-bg);
border: 1px solid var(--hairline-color);
border-radius: 4px;
cursor: pointer;
pointer-events: auto;

&.current {
border: 1px solid $green-light;
}
}
a,
button {
display: inline-block;
background: var(--body-bg);
padding: 8px 15px;
border-radius: 4px;
border: none;
@include sans-serif;
font-size: 12px;
line-height: inherit;
}

li {
display: none;
margin: 0 3px;
@include sans-serif;
color: var(--body-fg);
@include font-size(12);
pointer-events: auto;
a {
text-decoration: none;
font-weight: 700;
color: var(--primary);
}

&.current {
display: inline-block;
background: var(--body-bg);
padding: 8px 15px;
border: 1px solid var(--hairline-color);
border-radius: 4px;
cursor: pointer;
&:hover,
&:focus-within {
border-color: $green-light;
a {
color: var(--secondary);
}
}
}

&.current-link {
display: inline-block;
}
#doc-languages,
#doc-versions {
position: relative;

a {
display: inline-block;
background: var(--body-bg);
color: var(--primary);
text-decoration: none;
font-weight: 700;
padding: 8px 15px;
border: 1px solid var(--hairline-color);
border-radius: 4px;
li {
display: inline-block;
padding: 0;
position: relative;

&:hover {
color: var(--secondary);
border: 1px solid $green-light;
&.current {
&::after {
content: "";
position: absolute;
top: 0;
left: -8px;
width: 8px;
height: 100%;
}
}

a.icon-chevron-up-align {
// Should be removed when icon-chevron-up image have the same black space on both sides.
padding-right: 11px;
&.other {
display: none;
position: absolute;
right: 100%;
top: 0;
margin-right: 2px;
white-space: nowrap;
z-index: 2;
}
}

&:hover {
pointer-events: auto;
padding: 2em 0;
margin: -1.75em 0;

li {
display: inline-block;
}
&:hover li.other,
&.open li.other {
display: inline-block;
}

}

#dev-warning,
Expand Down
24 changes: 8 additions & 16 deletions docs/templates/docs/doc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
</li>
</ul>
<ul id="doc-languages" class="language-switcher doc-switcher">
<li class="current">
<button>{% trans "Language:" %} <strong>{{ lang }}</strong></button>
</li>
{% for available_lang in available_languages %}
{% if lang != available_lang %}
<li class="other">
Expand All @@ -74,14 +77,15 @@
</li>
{% endif %}
{% endfor %}
<li class="current"
title="{% blocktrans %}Click on the links on the left to switch to another language.{% endblocktrans %}">
<span>{% trans "Language:" %} <strong>{{ lang }}</strong></span>
</li>
</ul>

{% get_all_doc_versions docurl as other_versions %}
<ul id="doc-versions" class="version-switcher doc-switcher">
<li class="current {% if release.is_dev %}dev{% endif %}">
<button>{% trans "Documentation version:" %}
<strong>{% if release.is_dev %}development{% else %}{{ version }}{% endif %}</strong>
</button>
</li>
{% for other_version in other_versions %}
{% if version != other_version %}
<li class="other">
Expand All @@ -94,18 +98,6 @@
</li>
{% endif %}
{% endfor %}
<li class="current{% if release.is_dev %} dev{% endif %}"
title="{% if release.is_dev %}{% blocktrans trimmed %}
This document is for Django's development version, which can be significantly different from previous releases.
{% endblocktrans %}{% else %}{% blocktrans trimmed %}
This document describes Django {{ version }}.
{% endblocktrans %}{% endif %} {% blocktrans trimmed %}
Click on the links on the left to see other versions.
{% endblocktrans %}">
<span>{% trans "Documentation version:" %}
<strong>{% if release.is_dev %}development{% else %}{{ version }}{% endif %}</strong>
</span>
</li>
</ul>
<ul id="backtotop-link">
<li class="current-link">
Expand Down