0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

rems: update breadcrumbs to use new sizing; improve variables by renaming @breadcrumb-separator to @breadcrumb-divider; change up colors

This commit is contained in:
Mark Otto 2014-07-08 16:00:52 -07:00
parent fd5a24dca0
commit f05365f73b
9 changed files with 40 additions and 35 deletions

View File

@ -2525,9 +2525,9 @@ tbody.collapse.in {
margin-left: .25rem;
vertical-align: middle;
content: "";
border-top: .25rem solid;
border-right: .25rem solid transparent;
border-left: .25rem solid transparent;
border-top: .3em solid;
border-right: .3em solid transparent;
border-left: .3em solid transparent;
}
.dropdown-toggle:focus {
outline: 0;
@ -2634,7 +2634,7 @@ tbody.collapse.in {
.navbar-fixed-bottom .dropdown .caret {
content: "";
border-top: 0;
border-bottom: .25rem solid;
border-bottom: .3em solid;
}
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
@ -2749,11 +2749,11 @@ tbody.collapse.in {
margin-left: 0;
}
.btn-lg .caret {
border-width: .25rem .25rem 0;
border-width: .3em .3em 0;
border-bottom-width: 0;
}
.dropup .btn-lg .caret {
border-width: 0 .25rem .25rem;
border-width: 0 .3em .3em;
}
.btn-group-vertical > .btn,
.btn-group-vertical > .btn-group,
@ -3692,18 +3692,19 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
color: #444;
}
.breadcrumb {
padding: 8px 15px;
padding: .75rem 1rem;
margin-bottom: 24px;
list-style: none;
background-color: #f5f5f5;
background-color: #eceeef;
border-radius: .2rem;
}
.breadcrumb > li {
display: inline-block;
}
.breadcrumb > li + li:before {
padding: 0 5px;
color: #ccc;
padding-right: .5rem;
padding-left: .5rem;
color: #818a91;
content: "/\00a0";
}
.breadcrumb > .active {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2525,9 +2525,9 @@ tbody.collapse.in {
margin-left: .25rem;
vertical-align: middle;
content: "";
border-top: .25rem solid;
border-right: .25rem solid transparent;
border-left: .25rem solid transparent;
border-top: .3em solid;
border-right: .3em solid transparent;
border-left: .3em solid transparent;
}
.dropdown-toggle:focus {
outline: 0;
@ -2634,7 +2634,7 @@ tbody.collapse.in {
.navbar-fixed-bottom .dropdown .caret {
content: "";
border-top: 0;
border-bottom: .25rem solid;
border-bottom: .3em solid;
}
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
@ -2749,11 +2749,11 @@ tbody.collapse.in {
margin-left: 0;
}
.btn-lg .caret {
border-width: .25rem .25rem 0;
border-width: .3em .3em 0;
border-bottom-width: 0;
}
.dropup .btn-lg .caret {
border-width: 0 .25rem .25rem;
border-width: 0 .3em .3em;
}
.btn-group-vertical > .btn,
.btn-group-vertical > .btn-group,
@ -3692,18 +3692,19 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
color: #444;
}
.breadcrumb {
padding: 8px 15px;
padding: .75rem 1rem;
margin-bottom: 24px;
list-style: none;
background-color: #f5f5f5;
background-color: #eceeef;
border-radius: .2rem;
}
.breadcrumb > li {
display: inline-block;
}
.breadcrumb > li + li:before {
padding: 0 5px;
color: #ccc;
padding-right: .5rem;
padding-left: .5rem;
color: #818a91;
content: "/\00a0";
}
.breadcrumb > .active {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -14,9 +14,10 @@
display: inline-block;
+ li:before {
content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px;
color: @breadcrumb-color;
content: "@{breadcrumb-divider}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding-left: .5rem;
padding-right: .5rem;
color: @breadcrumb-divider-color;
}
}

View File

@ -12,6 +12,7 @@
@gray: #55595c;
@gray-light: #818a91;
@gray-lighter: #eceeef;
@gray-lightest: #f7f7f9;
@brand-primary: #027de7;
@brand-success: #5cb85c;
@ -727,16 +728,17 @@
//
//##
@breadcrumb-padding-vertical: 8px;
@breadcrumb-padding-horizontal: 15px;
@breadcrumb-padding-vertical: .75rem;
@breadcrumb-padding-horizontal: 1rem;
//** Breadcrumb background color
@breadcrumb-bg: #f5f5f5;
//** Breadcrumb text color
@breadcrumb-color: #ccc;
@breadcrumb-bg: @gray-lighter;
//** Text color for the generated divider between breadcrumb items
@breadcrumb-divider-color: @gray-light;
//** Text color of current page in the breadcrumb
@breadcrumb-active-color: @gray-light;
//** Textual separator for between breadcrumb elements
@breadcrumb-separator: "/";
//** Textual divider for between breadcrumb elements
@breadcrumb-divider: "/";
//== Carousel