Lots of updates
This commit is contained in:
parent
e3cfff8310
commit
39e7af6238
454 changed files with 221168 additions and 36622 deletions
|
@ -12,7 +12,7 @@
|
|||
font-weight: $badge-font-weight;
|
||||
color: $badge-color;
|
||||
line-height: $badge-line-height;
|
||||
vertical-align: baseline;
|
||||
vertical-align: middle;
|
||||
white-space: nowrap;
|
||||
text-align: center;
|
||||
background-color: $badge-bg;
|
||||
|
@ -28,7 +28,9 @@
|
|||
position: relative;
|
||||
top: -1px;
|
||||
}
|
||||
.btn-xs & {
|
||||
|
||||
.btn-xs &,
|
||||
.btn-group-xs > .btn & {
|
||||
top: 0;
|
||||
padding: 1px 5px;
|
||||
}
|
||||
|
@ -36,11 +38,20 @@
|
|||
// [converter] extracted a& to a.badge
|
||||
|
||||
// Account for badges in navs
|
||||
a.list-group-item.active > &,
|
||||
.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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue