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

Jump to bottom

Reposition In Brief content #3867

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Reposition In Brief content #3867

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
9b5c537
Reposition In Brief content
iadawn May 17, 2024
ef034de
Provide heading and add to page nav #3859
iadawn Jun 6, 2024
dae7d2b
Label TOC and remove extra '<nav>' #3859
iadawn Jun 6, 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
14 changes: 14 additions & 0 deletions css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ h2:hover .fragmentlink svg {
visibility: visible;
}

#success-criterion h2, #guideline h2, #technique h2 {
margin: 0;
}

.navtoc ul {
margin: 0.5em 0;
}

dt div {
font-weight: normal;
Expand Down Expand Up @@ -377,4 +384,11 @@ margin-right:.8em;

.examples video {
max-width: 100%;
}

#brief {
margin-bottom: 3em;
}
#brief dl {
margin-left: 2em;
}
10 changes: 5 additions & 5 deletions techniques/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

<div class="default-grid with-gap leftcol">
<aside class="box nav-hack sidebar standalone-resource__sidebar ">
<nav>
<header class="box-h ">Page Contents</header>
<div class="box-i">
<header class="box-h ">Page Contents</header>
<div class="box-i">
<nav aria-label="page contents" class="navtoc">
<ul>
<li><a href="#aria">ARIA Techniques</a></li>
<li><a href="#client-side-script">Client-Side Script Techniques</a></li>
Expand All @@ -29,8 +29,8 @@
<li><a href="#text">Plain-Text Techniques</a></li>
<li><a href="#changelog">Change Log</a></li>
</ul>
</div>
</nav>
</nav>
</div>
</aside>

<main id="main" class="main-content standalone-resource__main">
Expand Down
10 changes: 5 additions & 5 deletions understanding/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@

<div class="default-grid with-gap leftcol">
<aside class="box nav-hack sidebar standalone-resource__sidebar ">
<nav>
<header class="box-h ">Page Contents</header>
<div class="box-i">
<header class="box-h ">Page Contents</header>
<div class="box-i">
<nav aria-label="page contents" class="navtoc">
<ul>
<li><a href="#perceivable">Perceivable</a></li>
<li><a href="#operable">Operable</a></li>
<li><a href="#understandable">Understandable</a></li>
<li><a href="#robust">Robust</a></li>
<li><a href="#other">Other Understanding Documents</a></li>
</ul>
</div>
</nav>
</nav>
</div>
</aside>

<main id="main" class="main-content standalone-resource__main">
Expand Down
21 changes: 10 additions & 11 deletions xslt/generate-techniques.xslt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@

<xsl:template name="navtoc">
<xsl:param name="meta" tunnel="yes"/>
<nav class="navtoc">
<ul id="navbar">
<nav aria-label="page contents" class="navtoc">
<ul>
<!-- <li><a href="#important-information">Important Information about Techniques</a></li> -->
<li><a href="#technique">About this Technique</a></li>
<li><a href="#applicability">Applicability</a></li>
<li><a href="#description">Description</a></li>
<xsl:if test="wcag:section-meaningfully-exists('examples', //html:section[@id = 'examples'])"><li><a href="#examples">Examples</a></li></xsl:if>
Expand Down Expand Up @@ -246,10 +247,10 @@
</xsl:template>

<xsl:template name="most-important-meta">
<aside class="box">
<header class="box-h box-h-icon">
<aside id="technique" class="box">
<h2 class="box-h box-h-icon">
About this Technique
</header>
</h2>
<div class="box-i">
<xsl:call-template name="about-this-technique"/>
</div>
Expand All @@ -271,12 +272,10 @@

<xsl:template name="sidebar">
<aside class="box nav-hack sidebar standalone-resource__sidebar" aria-labelledby="page-contents">
<nav>
<header class="box-h" id="page-contents">Page Contents</header>
<div class="box-i">
<xsl:call-template name="navtoc"/>
</div>
</nav>
<header class="box-h" id="page-contents">Page Contents</header>
<div class="box-i">
<xsl:call-template name="navtoc"/>
</div>
</aside>
</xsl:template>

Expand Down
40 changes: 14 additions & 26 deletions xslt/generate-understanding.xslt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,13 +665,17 @@

<xsl:template name="navtoc">
<xsl:param name="meta" tunnel="yes"/>
<nav aria-label="page contents" class="navtoc">
<ul>
<xsl:if test="name($meta) = 'success-criterion'">
<xsl:if test="wcag:section-meaningfully-exists('brief', //html:section[@id = 'brief'])">
<li>
<a href="#brief">In Brief</a>
</li>
</xsl:if>
<li>
<a href="#success-criterion">Success Criterion</a>
</li>
<li>
<a href="#intent">Intent</a>
</li>
Expand Down Expand Up @@ -729,6 +733,7 @@
<li><a href="#test-rules">Test Rules</a></li>
</xsl:if>
</ul>
</nav>
</xsl:template>


Expand Down Expand Up @@ -910,19 +915,19 @@
</h1>
<xsl:choose>
<xsl:when test="name($meta) = 'guideline' or name($meta) = 'success-criterion'">
<aside class="box">
<header class="box-h box-h-icon">
<xsl:apply-templates select="//html:section[@id = 'brief']"/>
<section id="{name($meta)}" class="box">
<h2 class="box-h box-h-icon">
<xsl:choose>
<xsl:when test="name($meta) = 'guideline'">Guideline </xsl:when>
<xsl:when test="name($meta) = 'success-criterion'">Success Criterion (SC) </xsl:when>
</xsl:choose></header>
</xsl:choose></h2>
<div class="box-i">
<xsl:apply-templates select="$meta/content/html:*" />
</div>
</aside>
</section>
<div class="excol-all"/>
<xsl:apply-templates select="//html:section[@id = 'status']"/>
<xsl:apply-templates select="//html:section[@id = 'brief']"/>
<xsl:apply-templates select="//html:section[@id = 'intent']"/>
<xsl:apply-templates select="//html:section[@id = 'benefits']"/>
<xsl:apply-templates select="//html:section[@id = 'examples']"/>
Expand Down Expand Up @@ -962,27 +967,10 @@
<xsl:template name="sidebar">
<xsl:param name="meta" tunnel="yes"/>
<aside class="box nav-hack sidebar standalone-resource__sidebar ">
<!--
<nav>
<h2 style="margin-top: 0; margin-bottom: 0; padding-bottom: 0; font-size: 1rem" id="about-this-page">Navigation</h2>
<ul>
<xsl:call-template name="prevnext">
<xsl:with-param name="which">side</xsl:with-param>
</xsl:call-template>
</ul>
</nav>
-->
<nav>
<header class="box-h ">Page Contents</header>
<div class="box-i">
<xsl:call-template name="navtoc"/>
</div>
</nav>
<!--
<p>
<em>This Understanding document is not normative, which means it is <a href="about"> not required to meet WCAG</a>.</em>
</p>
-->
<header class="box-h ">Page Contents</header>
<div class="box-i">
<xsl:call-template name="navtoc"/>
</div>
</aside>
</xsl:template>

Expand Down