Merge branch 'docs' of github.com:jgthms/bulma into docs

This commit is contained in:
Jeremy Thomas
2016-09-11 11:57:43 +01:00

View File

@@ -92,13 +92,8 @@ doc-subtab: nav
{% highlight html %}
<nav class="nav">
<div class="nav-left">
<<<<<<< HEAD
<a class="nav-item is-brand" href="#">
<img src="{{ site.baseurl }}/images/bulma.png" alt="Bulma logo}">
=======
<a class="nav-item" href="#">
<img src="{{ site.baseurl }}/images/bulma.png" alt="Bulma logo">
>>>>>>> master
</a>
</div>