diff options
author | Mark Otto <markotto@twitter.com> | 2012-08-27 21:56:46 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-08-27 21:56:46 +0400 |
commit | 1c9d5c43b06dc81de1320227244246a17d3a79f3 (patch) | |
tree | 86205eeddd550ebc2543108f9e5d2e9fbe00b4b8 /docs | |
parent | a2b9a5e1fecbcad93c0f1b08bf7f470c2aaaabdd (diff) |
fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links
Diffstat (limited to 'docs')
-rw-r--r-- | docs/assets/css/bootstrap.css | 30 | ||||
-rw-r--r-- | docs/components.html | 12 | ||||
-rw-r--r-- | docs/templates/pages/components.mustache | 12 |
3 files changed, 37 insertions, 17 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d19d6a4426..7ef011cec6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4693,12 +4693,12 @@ input[type="submit"].btn.btn-mini { box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } -.pagination li { +.pagination ul > li { display: inline; } -.pagination a, -.pagination span { +.pagination ul > li > a, +.pagination ul > li > span { float: left; padding: 0 14px; line-height: 38px; @@ -4708,36 +4708,36 @@ input[type="submit"].btn.btn-mini { border-left-width: 0; } -.pagination a:hover, -.pagination .active a, -.pagination .active span { +.pagination ul > li > a:hover, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a, -.pagination .active span { +.pagination ul > .active > a, +.pagination ul > .active > span { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover { color: #999999; cursor: default; background-color: transparent; } -.pagination li:first-child a, -.pagination li:first-child span { +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { border-left-width: 1px; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.pagination li:last-child a, -.pagination li:last-child span { +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; diff --git a/docs/components.html b/docs/components.html index 4eccbbc9ec..f47aecbf19 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1473,7 +1473,7 @@ </div> </div> <pre class="prettyprint linenums"> -<div class="pagination "> +<div class="pagination"> <ul> <li class="disabled"><a href="#">Prev</a></li> <li class="active"><a href="#">1</a></li> @@ -1481,6 +1481,16 @@ </ul> </div> </pre> + <p>You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.</p> +<pre class="prettyprint linenums"> +<div class="pagination"> + <ul> + <li class="disabled"><span>Prev</span></li> + <li class="active"><span>1</span></li> + ... + </ul> +</div> +</pre> <h3>Alignment</h3> <p>Add one of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.</p> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index ef02c464a6..53936e5d0d 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1402,7 +1402,7 @@ </div> </div> <pre class="prettyprint linenums"> -<div class="pagination "> +<div class="pagination"> <ul> <li class="disabled"><a href="#">Prev</a></li> <li class="active"><a href="#">1</a></li> @@ -1410,6 +1410,16 @@ </ul> </div> </pre> + <p>{{_i}}You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.{{/i}}</p> +<pre class="prettyprint linenums"> +<div class="pagination"> + <ul> + <li class="disabled"><span>Prev</span></li> + <li class="active"><span>1</span></li> + ... + </ul> +</div> +</pre> <h3>{{_i}}Alignment{{/i}}</h3> <p>{{_i}}Add one of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.{{/i}}</p> |