diff options
| author | Mark Otto <[email protected]> | 2013-07-05 14:24:40 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-05 14:24:40 -0500 |
| commit | fffb37ecead04a12c9c1aedaf357433f5f61d6a3 (patch) | |
| tree | 87e7416755ca7aa21ef93c9b5053dc17e5d9ec2f | |
| parent | 30c138c4bfc058ff49e3a99d947f81f549e5876c (diff) | |
| parent | 3279181f4253eb37cae61ecc1a3842c3d559ea49 (diff) | |
| download | bootstrap-fffb37ecead04a12c9c1aedaf357433f5f61d6a3.tar.xz bootstrap-fffb37ecead04a12c9c1aedaf357433f5f61d6a3.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | less/breadcrumbs.less | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f3ff478a9..d3bea53f3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3290,15 +3290,11 @@ button.close { text-shadow: 0 1px 0 #fff; } -.breadcrumb > li:after { +.breadcrumb > li + li:before { display: inline-block; padding: 0 5px; color: #ccc; - content: "\00a0 /"; -} - -.breadcrumb > li:last-child:after { - display: none; + content: "/\00a0"; } .breadcrumb > .active { diff --git a/docs/components.html b/docs/components.html index 79b00e991..4e763d6d4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1016,7 +1016,7 @@ body { padding-bottom: 70px; } <h1>Breadcrumbs <small></small></h1> </div> <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"> <ul class="breadcrumb"> <li class="active">Home</li> diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 2fe8217a3..956944a8b 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -12,15 +12,12 @@ > li { display: inline-block; text-shadow: 0 1px 0 #fff; - &:after { + &+li:before { 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; color: #ccc; } - &:last-child:after { - display: none; // No divider after last element - } } > .active { color: @gray-light; |
