mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Variables reorganization and breadcrumbs update
* Place component vars alongside the rest of the component vars * Redo some of the breadcrumbs code to add a var and remove `text-shadow`
This commit is contained in:
parent
b1819755b8
commit
4b0fa356f3
4 changed files with 28 additions and 25 deletions
11
dist/css/bootstrap.css
vendored
11
dist/css/bootstrap.css
vendored
|
@ -3277,7 +3277,7 @@ button.close {
|
|||
|
||||
.breadcrumb {
|
||||
padding: 8px 15px;
|
||||
margin: 0 0 20px;
|
||||
margin-bottom: 20px;
|
||||
list-style: none;
|
||||
background-color: #f5f5f5;
|
||||
border-radius: 4px;
|
||||
|
@ -3285,13 +3285,12 @@ button.close {
|
|||
|
||||
.breadcrumb > li {
|
||||
display: inline-block;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
}
|
||||
|
||||
.breadcrumb > li + li:before {
|
||||
display: inline-block;
|
||||
padding: 0 5px;
|
||||
color: #ccc;
|
||||
color: #cccccc;
|
||||
content: "/\00a0";
|
||||
}
|
||||
|
||||
|
@ -4077,7 +4076,7 @@ a.thumbnail:focus {
|
|||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
line-height: 1;
|
||||
color: #fff;
|
||||
color: #ffffff;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
vertical-align: middle;
|
||||
|
@ -4091,7 +4090,7 @@ a.thumbnail:focus {
|
|||
|
||||
a.badge:hover,
|
||||
a.badge:focus {
|
||||
color: #fff;
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
@ -4104,7 +4103,7 @@ a.badge:focus {
|
|||
a.list-group-item.active > .badge,
|
||||
.nav-pills > .active > a > .badge {
|
||||
color: #428bca;
|
||||
background-color: #fff;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
.nav-pills > li > a > .badge {
|
||||
|
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -5,21 +5,20 @@
|
|||
|
||||
.breadcrumb {
|
||||
padding: 8px 15px;
|
||||
margin: 0 0 @line-height-computed;
|
||||
margin-bottom: @line-height-computed;
|
||||
list-style: none;
|
||||
background-color: @breadcrumb-bg;
|
||||
border-radius: @border-radius-base;
|
||||
> li {
|
||||
display: inline-block;
|
||||
text-shadow: @breadcrumb-text-shadow;
|
||||
&+li:before {
|
||||
display: inline-block;
|
||||
content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
|
||||
padding: 0 5px;
|
||||
color: #ccc;
|
||||
color: @breadcrumb-color;
|
||||
}
|
||||
}
|
||||
> .active {
|
||||
color: @gray-light;
|
||||
color: @breadcrumb-active-color;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,20 +6,6 @@
|
|||
// Global values
|
||||
// --------------------------------------------------
|
||||
|
||||
|
||||
// Inner Files color variables (can say inline colors)
|
||||
// --------------------------------------------------
|
||||
|
||||
@accordion-border-color: #e5e5e5;
|
||||
|
||||
@badge-color: #fff;
|
||||
@badge-active-bg: #fff;
|
||||
@badge-link-hover-color: #fff;
|
||||
|
||||
@breadcrumb-bg: #f5f5f5;
|
||||
@breadcrumb-text-shadow: 0 1px 0 #fff;
|
||||
|
||||
|
||||
// Grays
|
||||
// -------------------------
|
||||
|
||||
|
@ -383,6 +369,25 @@
|
|||
@well-bg: #f5f5f5;
|
||||
|
||||
|
||||
// Accordion
|
||||
// -------------------------
|
||||
@accordion-border-color: #e5e5e5;
|
||||
|
||||
|
||||
// Badges
|
||||
// -------------------------
|
||||
@badge-color: #fff;
|
||||
@badge-active-bg: #fff;
|
||||
@badge-link-hover-color: #fff;
|
||||
|
||||
|
||||
// Breadcrumbs
|
||||
// -------------------------
|
||||
@breadcrumb-bg: #f5f5f5;
|
||||
@breadcrumb-color: #ccc;
|
||||
@breadcrumb-active-color: @gray-light;
|
||||
|
||||
|
||||
// Miscellaneous
|
||||
// -------------------------
|
||||
|
||||
|
|
Loading…
Reference in a new issue