mirror of
https://github.com/twbs/bootstrap.git
synced 2025-10-01 15:56:45 +02:00
resolve conflict
This commit is contained in:
@@ -401,6 +401,16 @@ a.menu:after,
|
||||
}
|
||||
}
|
||||
|
||||
.tab-content > *,
|
||||
.pill-content > * {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.tab-content > .active,
|
||||
.pill-content > .active {
|
||||
display:block;
|
||||
}
|
||||
|
||||
|
||||
// BREADCRUMBS
|
||||
// -----------
|
||||
|
Reference in New Issue
Block a user