Commit 879114a8 authored by Mark Otto's avatar Mark Otto

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

parents 6af94126 d8acb367
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@charset "UTF-8";
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
html { html {
font-family: sans-serif; font-family: sans-serif;
...@@ -4229,7 +4230,7 @@ input[type="button"].btn-block { ...@@ -4229,7 +4230,7 @@ input[type="button"].btn-block {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
color: #818a91; color: #818a91;
content: "/\\00a0"; content: "/ ";
} }
.breadcrumb > .active { .breadcrumb > .active {
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
...@@ -169,11 +169,11 @@ Alternatively, you can align each link to the sides: ...@@ -169,11 +169,11 @@ Alternatively, you can align each link to the sides:
Pager links also use the `.disabled` class. Pager links also use the `.disabled` class.
{% highlight html %} {% example html %}
<nav> <nav>
<ul class="pager"> <ul class="pager">
<li class="pager-prev disabled"><a href="#">Older</a></li> <li class="pager-prev disabled"><a href="#">Older</a></li>
<li class="pager-next"><a href="#">Newer</a></li> <li class="pager-next"><a href="#">Newer</a></li>
</ul> </ul>
</nav> </nav>
{% endhighlight %} {% endexample %}
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@charset "UTF-8";
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
html { html {
font-family: sans-serif; font-family: sans-serif;
...@@ -4229,7 +4230,7 @@ input[type="button"].btn-block { ...@@ -4229,7 +4230,7 @@ input[type="button"].btn-block {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
color: #818a91; color: #818a91;
content: "/\\00a0"; content: "/ ";
} }
.breadcrumb > .active { .breadcrumb > .active {
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
...@@ -89,7 +89,7 @@ Similarly, the latest versions of most desktop browsers are supported. ...@@ -89,7 +89,7 @@ Similarly, the latest versions of most desktop browsers are supported.
</table> </table>
</div> </div>
Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 8-, though they are not officially supported. Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 8 and below, though they are not officially supported.
For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs](../browser-bugs/). For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs](../browser-bugs/).
......
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
display: inline-block; display: inline-block;
+ li:before { + li:before {
$nbsp: "\00a0";
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
color: $breadcrumb-divider-color; color: $breadcrumb-divider-color;
content: "#{$breadcrumb-divider}\00a0"; // Unicode space added since inline-block means non-collapsing white-space content: "#{$breadcrumb-divider}#{$nbsp}"; // Unicode space added since inline-block means non-collapsing white-space
} }
} }
......
Markdown is supported
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