Commit fffb37ec authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents 30c138c4 3279181f
Showing with 5 additions and 12 deletions
+5 -12
...@@ -3290,15 +3290,11 @@ button.close { ...@@ -3290,15 +3290,11 @@ button.close {
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
.breadcrumb > li:after { .breadcrumb > li + li:before {
display: inline-block; display: inline-block;
padding: 0 5px; padding: 0 5px;
color: #ccc; color: #ccc;
content: "\00a0 /"; content: "/\00a0";
}
.breadcrumb > li:last-child:after {
display: none;
} }
.breadcrumb > .active { .breadcrumb > .active {
......
...@@ -1016,7 +1016,7 @@ body { padding-bottom: 70px; } ...@@ -1016,7 +1016,7 @@ body { padding-bottom: 70px; }
<h1>Breadcrumbs <small></small></h1> <h1>Breadcrumbs <small></small></h1>
</div> </div>
<p class="lead">Indicate the current page's location within a navigational hierarchy.</p> <p class="lead">Indicate the current page's location within a navigational hierarchy.</p>
<p>Separators are automatically added in CSS through <code>:after</code> and <code>content</code>.</p> <p>Separators are automatically added in CSS through <code>:before</code> and <code>content</code>.</p>
<div class="bs-example"> <div class="bs-example">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li class="active">Home</li> <li class="active">Home</li>
......
...@@ -12,15 +12,12 @@ ...@@ -12,15 +12,12 @@
> li { > li {
display: inline-block; display: inline-block;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
&:after { &+li:before {
display: inline-block; display: inline-block;
content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px; padding: 0 5px;
color: #ccc; color: #ccc;
} }
&:last-child:after {
display: none; // No divider after last element
}
} }
> .active { > .active {
color: @gray-light; color: @gray-light;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment