diff --git a/dist/css/bootstrap-flex.css b/dist/css/bootstrap-flex.css index 4c3325230232273f13729fc4298b1212b6022b09..69474a3743a372952a59c1974e78d1a26f437307 100644 --- a/dist/css/bootstrap-flex.css +++ b/dist/css/bootstrap-flex.css @@ -3319,43 +3319,6 @@ a.label:hover { .label-danger[href]:hover { background-color: #c9302c; } -.badge { - position: relative; - top: -.1em; - display: inline-block; - padding-right: .6em; - padding-left: .6em; - font-size: .75em; - font-weight: bold; - line-height: 1.5; - color: #fff; - text-align: center; - white-space: nowrap; - vertical-align: middle; - background-color: #818a91; - border-radius: 2em; } - .badge:empty { - display: none; } - .badge.pull-left, - .badge.pull-right { - top: .2em; } - .list-group-item.active > .badge, - .nav-pills > .active > a > .badge { - color: #0275d8; - background-color: #fff; } - .list-group-item > .badge { - float: right; } - .list-group-item > .badge + .badge { - margin-right: 5px; } - .nav-pills > li > a > .badge { - margin-left: 3px; } - -a.badge:focus, -a.badge:hover { - color: #fff; - text-decoration: none; - cursor: pointer; } - .jumbotron { padding: 2rem 1rem; margin-bottom: 2rem; diff --git a/dist/css/bootstrap-flex.css.map b/dist/css/bootstrap-flex.css.map index 8df125ced456d2a2c336fbfa666fcbaf6dc6e441..0e9f773f5480edee123675b0d9231ccb596a2a51 100644 Binary files a/dist/css/bootstrap-flex.css.map and b/dist/css/bootstrap-flex.css.map differ diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5ac5fafe9c3f70e23b96230438617cb81467031b..0ddd78460c458488a529aa81a47a441be080ef4e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3234,43 +3234,6 @@ a.label:hover { .label-danger[href]:hover { background-color: #c9302c; } -.badge { - position: relative; - top: -.1em; - display: inline-block; - padding-right: .6em; - padding-left: .6em; - font-size: .75em; - font-weight: bold; - line-height: 1.5; - color: #fff; - text-align: center; - white-space: nowrap; - vertical-align: middle; - background-color: #818a91; - border-radius: 2em; } - .badge:empty { - display: none; } - .badge.pull-left, - .badge.pull-right { - top: .2em; } - .list-group-item.active > .badge, - .nav-pills > .active > a > .badge { - color: #0275d8; - background-color: #fff; } - .list-group-item > .badge { - float: right; } - .list-group-item > .badge + .badge { - margin-right: 5px; } - .nav-pills > li > a > .badge { - margin-left: 3px; } - -a.badge:focus, -a.badge:hover { - color: #fff; - text-decoration: none; - cursor: pointer; } - .jumbotron { padding: 2rem 1rem; margin-bottom: 2rem; diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map index aaa1ccd9d50a228e36a44b55778daf35a51ddbbf..3fbc2414e2313a01e4b0fa6a2c50c48449cc4b30 100644 Binary files a/dist/css/bootstrap.css.map and b/dist/css/bootstrap.css.map differ diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index aeaa571570314574a8eb23509495a96fc6308ee4..6fd5583a32edcc593d4dadb2ece0be9e27319d14 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -33,7 +33,6 @@ - title: Input group - title: Dropdowns - title: Jumbotron - - title: Badges - title: Label - title: Alerts - title: Card diff --git a/docs/components/badges.md b/docs/components/badges.md deleted file mode 100644 index 324053fec3129d238fe9954d9f09bfb9ddb1b4fb..0000000000000000000000000000000000000000 --- a/docs/components/badges.md +++ /dev/null @@ -1,56 +0,0 @@ ---- -layout: page -title: Badges ---- - -Badges are indicators for new or unread activity and include support for the active states of our [navigation components](/components/navs/), links, buttons, and more. - -## Contents - -* Will be replaced with the ToC, excluding the "Contents" header -{:toc} - -{% example html %} -<a href="#">Inbox <span class="badge">42</span></a> -{% endexample %} - -### Self collapsing - -When there are no new or unread items, badges will simply collapse (via CSS's `:empty` selector) provided no content exists within. - -### Active nav - -Built-in styles are included for placing badges in active states in pill navigations. - -{% example html %} -<ul class="nav nav-pills" role="tablist"> - <li class="nav-item active" role="presentation"> - <a class="nav-link" href="#">Home <span class="badge">42</span></a> - </li> - <li class="nav-item" role="presentation"> - <a class="nav-link" href="#">Profile</a> - </li> - <li class="nav-item" role="presentation"> - <a class="nav-link" href="#">Messages <span class="badge">3</span></a> - </li> -</ul> -{% endexample %} - -### Buttons - -Like active nav links, badges in Bootstrap buttons automatically restyle to better blend into the background. - -{% example html %} -<button class="btn btn-primary btn-lg" type="button"> - Large button <span class="badge">4</span> -</button> -<button class="btn btn-primary" type="button"> - Button <span class="badge">4</span> -</button> -<button class="btn btn-primary btn-sm" type="button"> - Small button <span class="badge">4</span> -</button> -<button class="btn btn-primary btn-xs" type="button"> - Extra small <span class="badge">4</span> -</button> -{% endexample %} diff --git a/scss/_badge.scss b/scss/_badge.scss deleted file mode 100644 index ca2ca111575d60b5b4c13d247c127962a5bf8b6c..0000000000000000000000000000000000000000 --- a/scss/_badge.scss +++ /dev/null @@ -1,56 +0,0 @@ -// -// Badges -// -------------------------------------------------- - - -.badge { - position: relative; - top: -.1em; - display: inline-block; - padding-right: .6em; - padding-left: .6em; - font-size: .75em; - font-weight: $badge-font-weight; - line-height: $line-height; - color: $badge-color; - text-align: center; - white-space: nowrap; - vertical-align: middle; - background-color: $badge-bg; - @include border-radius($badge-border-radius); - - // Empty badges collapse automatically - &:empty { - display: none; - } - - &.pull-left, - &.pull-right { - top: .2em; - } - - // Account for badges in navs - .list-group-item.active > &, - .nav-pills > .active > a > & { - color: $badge-active-color; - background-color: $badge-active-bg; - } - .list-group-item > & { - float: right; - } - .list-group-item > & + & { - margin-right: 5px; - } - .nav-pills > li > a > & { - margin-left: 3px; - } -} - -// Hover state, but only for links -a.badge { - @include hover-focus { - color: $badge-link-hover-color; - text-decoration: none; - cursor: pointer; - } -} diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 5df72fe3b7200c23dd6783b5c8698b4e9a94cec4..892ae560a8084d1cdb045e22a793175bfeb23b02 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -29,7 +29,6 @@ @import "pagination"; @import "pager"; @import "labels"; -@import "badge"; @import "jumbotron"; @import "alert"; @import "progress";