aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-07-09 00:15:20 -0700
committerMark Otto <[email protected]>2014-07-09 00:15:20 -0700
commita8625f452ef45fb1a59c049cf02608408303e817 (patch)
treec7c7119d744f73f505e63563600ee279d6eccfcb /docs/dist/css/bootstrap.css
parentf380ca21e207e688e40a8cbef6d0b5a2c2a00472 (diff)
downloadbootstrap-a8625f452ef45fb1a59c049cf02608408303e817.tar.xz
bootstrap-a8625f452ef45fb1a59c049cf02608408303e817.zip
Badges, navs, and more
Diffstat (limited to 'docs/dist/css/bootstrap.css')
-rw-r--r--docs/dist/css/bootstrap.css30
1 files changed, 18 insertions, 12 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
index 6159d6063..ebedf2af0 100644
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -2988,7 +2988,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav > li > a {
position: relative;
display: block;
- padding: 10px 15px;
+ padding: .5em 1em;
+ line-height: 1.5;
}
.nav > li > a:hover,
.nav > li > a:focus {
@@ -3903,29 +3904,34 @@ a.label:focus {
background-color: #c9302c;
}
.badge {
+ position: relative;
+ top: -.1em;
display: inline-block;
- min-width: 10px;
- padding: 3px 7px;
- font-size: .85rem;
+ padding-right: .6em;
+ padding-left: .6em;
+ font-size: .75em;
font-weight: bold;
- line-height: 1;
color: #fff;
text-align: center;
white-space: nowrap;
- vertical-align: baseline;
background-color: #818a91;
- border-radius: 10px;
+ border-radius: 2em;
+ /* .btn & {
+ position: relative;
+ top: -1px;
+ }
+*/
}
.badge:empty {
display: none;
}
-.btn .badge {
- position: relative;
- top: -1px;
+.badge.pull-left,
+.badge.pull-right {
+ top: .2em;
}
.btn-xs .badge {
- top: 0;
- padding: 1px 5px;
+ /*top: 0;*/
+ /*padding: 1px 5px;*/
}
a.badge:hover,
a.badge:focus {