diff options
| author | Mark Otto <[email protected]> | 2016-01-06 14:57:51 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-01-06 14:57:51 -0800 |
| commit | 095dd9ffb068ade2cf636951553430b969b34196 (patch) | |
| tree | 3e5c077c4deff913c6f5657725613cc519f0c87a | |
| parent | c06cb8e3205776c0830cd4c7b541012f14f9461b (diff) | |
| parent | 20261385eacd6e86a362a08d56b4b4241ef248df (diff) | |
| download | bootstrap-095dd9ffb068ade2cf636951553430b969b34196.tar.xz bootstrap-095dd9ffb068ade2cf636951553430b969b34196.zip | |
Merge pull request #18782 from twbs/v4-rip-pager
v4: Drop pager component
| -rw-r--r-- | docs/components/pagination.md | 51 | ||||
| -rw-r--r-- | docs/examples/blog/blog.css | 8 | ||||
| -rw-r--r-- | docs/examples/blog/index.html | 8 | ||||
| -rw-r--r-- | docs/migration.md | 4 | ||||
| -rw-r--r-- | scss/_pager.scss | 58 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 1 |
6 files changed, 11 insertions, 119 deletions
diff --git a/docs/components/pagination.md b/docs/components/pagination.md index 1ec25b789..9804da83f 100644 --- a/docs/components/pagination.md +++ b/docs/components/pagination.md @@ -11,7 +11,7 @@ Provide pagination links for your site or app with the multi-page pagination com * Will be replaced with the ToC, excluding the "Contents" header {:toc} -## Default pagination +## Overview 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. @@ -39,7 +39,7 @@ Simple pagination inspired by Rdio, great for apps and search results. The large </nav> {% endexample %} -### Disabled and active states +## Disabled and active states Links are customizable for different circumstances. Use `.disabled` for unclickable links and `.active` to indicate the current page. @@ -49,7 +49,6 @@ Links are customizable for different circumstances. Use `.disabled` for unclicka The `.disabled` class uses `pointer-events: none` to try to disable the link functionality of `<a>`s, but that CSS property is not yet standardized. In addition, even in browsers that do support `pointer-events: none`, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, add a `tabindex="-1"` attribute on these links (to prevent them from receiving keyboard focus) and use custom JavaScript to disable their functionality. {% endcallout %} - {% example html %} <nav> <ul class="pagination"> @@ -93,7 +92,7 @@ You can optionally swap out active or disabled anchors for `<span>`, or omit the {% endexample %} -### Sizing +## Sizing Fancy larger or smaller pagination? Add `.pagination-lg` or `.pagination-sm` for additional sizes. @@ -140,47 +139,3 @@ Fancy larger or smaller pagination? Add `.pagination-lg` or `.pagination-sm` for </ul> </nav> {% endexample %} - -## Pager - -Quick previous and next links for simple pagination implementations with light markup and styles. It's great for simple sites like blogs or magazines. - -### Default example - -By default, the pager centers links. - -{% example html %} -<nav> - <ul class="pager"> - <li><a href="#">Previous</a></li> - <li><a href="#">Next</a></li> - </ul> -</nav> -{% endexample %} - -### Aligned links - -Alternatively, you can align each link to the sides: - -{% example html %} -<nav> - <ul class="pager"> - <li class="pager-prev"><a href="#">Older</a></li> - <li class="pager-next"><a href="#">Newer</a></li> - </ul> -</nav> -{% endexample %} - - -### Optional disabled state - -Pager links also support the `.disabled` class (though note that the same advice about keyboard focus as for the default pagination applies here as well). - -{% example html %} -<nav> - <ul class="pager"> - <li class="pager-prev disabled"><a href="#" tabindex="-1">Older</a></li> - <li class="pager-next"><a href="#">Newer</a></li> - </ul> -</nav> -{% endexample %} diff --git a/docs/examples/blog/blog.css b/docs/examples/blog/blog.css index da14fce9c..5fed56424 100644 --- a/docs/examples/blog/blog.css +++ b/docs/examples/blog/blog.css @@ -125,14 +125,10 @@ h6, .h6 { /* Pagination */ -.pager { +.blog-pagination { margin-bottom: 4rem; - text-align: left; } -.pager > li > a { - width: 8rem; - padding: .75rem 1.25rem; - text-align: center; +.blog-pagination > .btn { border-radius: 2rem; } diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index 57cfafacf..d73f5ec69 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -104,11 +104,9 @@ <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla vitae elit libero, a pharetra augue.</p> </div><!-- /.blog-post --> - <nav> - <ul class="pager"> - <li><a href="#">Older</a></li> - <li class="disabled"><a href="#">Newer</a></li> - </ul> + <nav class="blog-pagination"> + <a class="btn btn-outline-primary" href="#">Older</a> + <a class="btn btn-outline-secondary disabled" href="#">Newer</a> </nav> </div><!-- /.blog-main --> diff --git a/docs/migration.md b/docs/migration.md index 7066ec656..effbc90a5 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -36,7 +36,8 @@ Here are the big ticket items you'll want to be aware of when moving from v3 to - [Font Awesome](https://fortawesome.github.io/Font-Awesome/) - Dropped the Affix jQuery plugin. We recommend using a `position: sticky` polyfill instead. [See the HTML5 Please entry](http://html5please.com/#sticky) for details and specific polyfill recommendations. - If you were using Affix to apply additional, non-`position` styles, the polyfills might not support your use case. One option for such uses is the third-party [ScrollPos-Styler](https://github.com/acch/scrollpos-styler) library. -- Refactored nearly all components to use more unnested classes instead of children selectors. +- Dropped the pager component as it was essentially slightly customized buttons. +- Refactored nearly all components to use more un-nested classes instead of children selectors. ### Misc - Non-responsive usage of Bootstrap is no longer supported. @@ -113,6 +114,7 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with ### Pagination - Explicit classes (`.page-item`, `.page-link`) are now required on the descendants of `.pagination`s +- Dropped the `.pager` component entirely as it was little more than customized outline buttons. ### Breadcrumbs diff --git a/scss/_pager.scss b/scss/_pager.scss deleted file mode 100644 index 1aaa24408..000000000 --- a/scss/_pager.scss +++ /dev/null @@ -1,58 +0,0 @@ -.pager { - padding-left: 0; - margin-top: $spacer-y; - margin-bottom: $spacer-y; - text-align: center; - list-style: none; - @include clearfix(); - - li { - display: inline; - - > a, - > span { - display: inline-block; - padding: 5px 14px; - background-color: $pager-bg; - border: $pager-border-width solid $pager-border-color; - border-radius: $pager-border-radius; - } - - > a { - @include hover-focus { - text-decoration: none; - background-color: $pager-hover-bg; - } - } - } - - .disabled { - > a { - @include plain-hover-focus { - color: $pager-disabled-color; - pointer-events: none; - cursor: $cursor-disabled; - background-color: $pager-bg; - } - } - > span { - color: $pager-disabled-color; - cursor: $cursor-disabled; - background-color: $pager-bg; - } - } -} - -.pager-next { - > a, - > span { - float: right; - } -} - -.pager-prev { - > a, - > span { - float: left; - } -} diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index a5684181f..ab33f86c4 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -33,7 +33,6 @@ @import "card"; @import "breadcrumb"; @import "pagination"; -@import "pager"; @import "labels"; @import "jumbotron"; @import "alert"; |
