Fix rebase

This commit is contained in:
Jeremy Thomas
2017-10-10 10:22:28 +01:00
parent 2c11a76707
commit 465ad931e6
6 changed files with 2124 additions and 679 deletions

View File

@@ -1018,6 +1018,7 @@ document.addEventListener('DOMContentLoaded', function () {
</p>
<ul>
<li><code>is-primary</code></li>
<li><code>is-link</code></li>
<li><code>is-info</code></li>
<li><code>is-success</code></li>
<li><code>is-warning</code></li>
@@ -1035,6 +1036,10 @@ document.addEventListener('DOMContentLoaded', function () {
{% include examples/navbar-color.html color="primary" %}
</div>
<div class="bd-example is-paddingless">
{% include examples/navbar-color.html color="link" %}
</div>
<div class="bd-example is-paddingless">
{% include examples/navbar-color.html color="info" %}
</div>