Skip to content
GitLab
Commit b2088366 authored by Chris Rebert's avatar Chris Rebert
Browse files

Wrap .pagination & .pager in <nav> to improve accessibility

parent f6264b44
5 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!14577Wrap .pagination & .pager in <nav> to improve accessibility,!25326Adjust examples
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 74 deletions
+98 -74
docs/_includes/components/pagination.html
+ 92
- 70
View file @ b2088366
...@@ -6,62 +6,72 @@ ...@@ -6,62 +6,72 @@
<h2 id="pagination-default">Default pagination</h2> <h2 id="pagination-default">Default pagination</h2>
<p>Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.</p> <p>Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="pagination"> <nav>
<li><a href="#">&laquo;</a></li> <ul class="pagination">
<li><a href="#">1</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">2</a></li> <li><a href="#">1</a></li>
<li><a href="#">3</a></li> <li><a href="#">2</a></li>
<li><a href="#">4</a></li> <li><a href="#">3</a></li>
<li><a href="#">5</a></li> <li><a href="#">4</a></li>
<li><a href="#">&raquo;</a></li> <li><a href="#">5</a></li>
</ul> <li><a href="#">&raquo;</a></li>
</ul>
</nav>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pagination"> <nav>
<li><a href="#">&laquo;</a></li> <ul class="pagination">
<li><a href="#">1</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">2</a></li> <li><a href="#">1</a></li>
<li><a href="#">3</a></li> <li><a href="#">2</a></li>
<li><a href="#">4</a></li> <li><a href="#">3</a></li>
<li><a href="#">5</a></li> <li><a href="#">4</a></li>
<li><a href="#">&raquo;</a></li> <li><a href="#">5</a></li>
</ul> <li><a href="#">&raquo;</a></li>
</ul>
</nav>
{% endhighlight %} {% endhighlight %}
<h3>Disabled and active states</h3> <h3>Disabled and active states</h3>
<p>Links are customizable for different circumstances. Use <code>.disabled</code> for unclickable links and <code>.active</code> to indicate the current page.</p> <p>Links are customizable for different circumstances. Use <code>.disabled</code> for unclickable links and <code>.active</code> to indicate the current page.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="pagination"> <nav>
<li class="disabled"><a href="#">&laquo;</a></li> <ul class="pagination">
<li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li> <li class="disabled"><a href="#">&laquo;</a></li>
<li><a href="#">2</a></li> <li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li>
<li><a href="#">3</a></li> <li><a href="#">2</a></li>
<li><a href="#">4</a></li> <li><a href="#">3</a></li>
<li><a href="#">5</a></li> <li><a href="#">4</a></li>
<li><a href="#">&raquo;</a></li> <li><a href="#">5</a></li>
</ul> <li><a href="#">&raquo;</a></li>
</ul>
</nav>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pagination"> <nav>
<li class="disabled"><a href="#">&laquo;</a></li> <ul class="pagination">
<li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li> <li class="disabled"><a href="#">&laquo;</a></li>
... <li class="active"><a href="#">1 <span class="sr-only">(current)</span></a></li>
</ul> ...
</ul>
</nav>
{% endhighlight %} {% endhighlight %}
<p>You can optionally swap out active or disabled anchors for <code>&lt;span&gt;</code> to remove click functionality while retaining intended styles.</p> <p>You can optionally swap out active or disabled anchors for <code>&lt;span&gt;</code> to remove click functionality while retaining intended styles.</p>
{% highlight html %} {% highlight html %}
<ul class="pagination"> <nav>
<li class="disabled"><span>&laquo;</span></li> <ul class="pagination">
<li class="active"><span>1 <span class="sr-only">(current)</span></span></li> <li class="disabled"><span>&laquo;</span></li>
... <li class="active"><span>1 <span class="sr-only">(current)</span></span></li>
</ul> ...
</ul>
</nav>
{% endhighlight %} {% endhighlight %}
<h3>Sizing</h3> <h3>Sizing</h3>
<p>Fancy larger or smaller pagination? Add <code>.pagination-lg</code> or <code>.pagination-sm</code> for additional sizes.</p> <p>Fancy larger or smaller pagination? Add <code>.pagination-lg</code> or <code>.pagination-sm</code> for additional sizes.</p>
<div class="bs-example"> <div class="bs-example">
<div> <nav>
<ul class="pagination pagination-lg"> <ul class="pagination pagination-lg">
<li><a href="#">&laquo;</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">1</a></li> <li><a href="#">1</a></li>
...@@ -71,8 +81,8 @@ ...@@ -71,8 +81,8 @@
<li><a href="#">5</a></li> <li><a href="#">5</a></li>
<li><a href="#">&raquo;</a></li> <li><a href="#">&raquo;</a></li>
</ul> </ul>
</div> </nav>
<div> <nav>
<ul class="pagination"> <ul class="pagination">
<li><a href="#">&laquo;</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">1</a></li> <li><a href="#">1</a></li>
...@@ -82,8 +92,8 @@ ...@@ -82,8 +92,8 @@
<li><a href="#">5</a></li> <li><a href="#">5</a></li>
<li><a href="#">&raquo;</a></li> <li><a href="#">&raquo;</a></li>
</ul> </ul>
</div> </nav>
<div> <nav>
<ul class="pagination pagination-sm"> <ul class="pagination pagination-sm">
<li><a href="#">&laquo;</a></li> <li><a href="#">&laquo;</a></li>
<li><a href="#">1</a></li> <li><a href="#">1</a></li>
...@@ -93,12 +103,12 @@ ...@@ -93,12 +103,12 @@
<li><a href="#">5</a></li> <li><a href="#">5</a></li>
<li><a href="#">&raquo;</a></li> <li><a href="#">&raquo;</a></li>
</ul> </ul>
</div> </nav>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pagination pagination-lg">...</ul> <nav><ul class="pagination pagination-lg">...</ul></nav>
<ul class="pagination">...</ul> <nav><ul class="pagination">...</ul></nav>
<ul class="pagination pagination-sm">...</ul> <nav><ul class="pagination pagination-sm">...</ul></nav>
{% endhighlight %} {% endhighlight %}
...@@ -108,46 +118,58 @@ ...@@ -108,46 +118,58 @@
<h3>Default example</h3> <h3>Default example</h3>
<p>By default, the pager centers links.</p> <p>By default, the pager centers links.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="pager"> <nav>
<li><a href="#">Previous</a></li> <ul class="pager">
<li><a href="#">Next</a></li> <li><a href="#">Previous</a></li>
</ul> <li><a href="#">Next</a></li>
</ul>
</nav>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pager"> <nav>
<li><a href="#">Previous</a></li> <ul class="pager">
<li><a href="#">Next</a></li> <li><a href="#">Previous</a></li>
</ul> <li><a href="#">Next</a></li>
</ul>
</nav>
{% endhighlight %} {% endhighlight %}
<h3>Aligned links</h3> <h3>Aligned links</h3>
<p>Alternatively, you can align each link to the sides:</p> <p>Alternatively, you can align each link to the sides:</p>
<div class="bs-example"> <div class="bs-example">
<ul class="pager"> <nav>
<li class="previous"><a href="#">&larr; Older</a></li> <ul class="pager">
<li class="next"><a href="#">Newer &rarr;</a></li> <li class="previous"><a href="#">&larr; Older</a></li>
</ul> <li class="next"><a href="#">Newer &rarr;</a></li>
</ul>
</nav>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pager"> <nav>
<li class="previous"><a href="#">&larr; Older</a></li> <ul class="pager">
<li class="next"><a href="#">Newer &rarr;</a></li> <li class="previous"><a href="#">&larr; Older</a></li>
</ul> <li class="next"><a href="#">Newer &rarr;</a></li>
</ul>
</nav>
{% endhighlight %} {% endhighlight %}
<h3>Optional disabled state</h3> <h3>Optional disabled state</h3>
<p>Pager links also use the general <code>.disabled</code> utility class from the pagination.</p> <p>Pager links also use the general <code>.disabled</code> utility class from the pagination.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="pager"> <nav>
<li class="previous disabled"><a href="#">&larr; Older</a></li> <ul class="pager">
<li class="next"><a href="#">Newer &rarr;</a></li> <li class="previous disabled"><a href="#">&larr; Older</a></li>
</ul> <li class="next"><a href="#">Newer &rarr;</a></li>
</ul>
</nav>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="pager"> <nav>
<li class="previous disabled"><a href="#">&larr; Older</a></li> <ul class="pager">
<li class="next"><a href="#">Newer &rarr;</a></li> <li class="previous disabled"><a href="#">&larr; Older</a></li>
</ul> <li class="next"><a href="#">Newer &rarr;</a></li>
</ul>
</nav>
{% endhighlight %} {% endhighlight %}
</div> </div>
docs/examples/blog/index.html
+ 6
- 4
View file @ b2088366
...@@ -111,10 +111,12 @@ ...@@ -111,10 +111,12 @@
<p>Donec ullamcorper nulla non metus auctor fringilla. Nulla vitae elit libero, a pharetra augue.</p> <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla vitae elit libero, a pharetra augue.</p>
</div><!-- /.blog-post --> </div><!-- /.blog-post -->
<ul class="pager"> <nav>
<li><a href="#">Previous</a></li> <ul class="pager">
<li><a href="#">Next</a></li> <li><a href="#">Previous</a></li>
</ul> <li><a href="#">Next</a></li>
</ul>
</nav>
</div><!-- /.blog-main --> </div><!-- /.blog-main -->
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment