Skip to content

Commit

Permalink
Merge branch 'gh-pages' into hidden-attribute-clarifications
Browse files Browse the repository at this point in the history
  • Loading branch information
scottaohara authored Dec 13, 2024
2 parents ffe41cf + 4cd9bdc commit 1a58b61
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
11 changes: 6 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ <h3>Adhere to the rules of HTML</h3>
...
&lt;p>&lt;/p>

&lt;!-- Use a span are allowed in p elements! -->
&lt;!-- Instead of a div, use a span. Spans are allowed descendants of p elements! -->
&lt;p>
... &lt;span role=link tabindex=0>...&lt;/span> ...
&lt;/p>
Expand Down Expand Up @@ -594,7 +594,7 @@ <h2 id="docconformance">
</td>
<td>
<p>
<a><strong>Any `role`</strong></a>, though <a href="#index-aria-group">`group`</a> SHOULD NOT be used.
<a><strong>Any `role`</strong></a>, though <a href="#index-aria-group">`group`</a> is NOT RECOMMENDED.
</p>
<p>
Otherwise, <a data-cite="wai-aria-1.2#global_states">global `aria-*` attributes</a>
Expand Down Expand Up @@ -1481,7 +1481,7 @@ <h2 id="docconformance">
</td>
<td>
<p>
<a><strong>Any `role`</strong></a>, though <a href="#index-aria-group">`group`</a> SHOULD NOT be used.
<a><strong>Any `role`</strong></a>, though <a href="#index-aria-group">`group`</a> is NOT RECOMMENDED.
</p>
<p>
Otherwise, <a data-cite="wai-aria-1.2#global_states">global `aria-*` attributes</a>
Expand Down Expand Up @@ -2257,7 +2257,7 @@ <h2 id="docconformance">
if the parent list element has an implicit or explicit `list` role.
</p>
<p>
Otherwise, <a><strong>any `role`</strong></a> if the parent list item does not expose an implicit or explicit `list` role.
Otherwise, <a><strong>any `role`</strong></a> if the parent list element does not expose an implicit or explicit `list` role.
</p>
<p class="note">
See <a href="#el-ul">`ul`</a>, <a href="#el-ol">`ol`</a>, or
Expand Down Expand Up @@ -2415,7 +2415,8 @@ <h2 id="docconformance">
</p>
<p>
Otherwise, any
<a data-cite="wai-aria-1.2#global_states">global `aria-*` attributes</a>.
<a data-cite="wai-aria-1.2#global_states">global `aria-*` attributes</a>
and any other `aria-*` attributes applicable to the `meter` role.
</p>
</td>
</tr>
Expand Down
12 changes: 1 addition & 11 deletions makeup.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,16 @@ a code {
padding: 0;
}

.simple thead {
position: sticky;
top: 0px;
}

table th ul,
table td ul {
padding-left: .825em;
}

.simple th {
scroll-margin-top: 120px;
}



/* these classes don't behave very well for inline changes.
so these updates were made to make these work better in
this spec. */
span.addition.proposed,
span.addition.correction,
span.correction.proposed,
span.amendment.proposed {
padding: .125em .25em;
Expand Down

0 comments on commit 1a58b61

Please sign in to comment.