Ark/bulma
1
0
Fork 0
mirror of https://github.com/jgthms/bulma synced 2026-03-20 12:24:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Thomas
2016-09-11 11:57:43 +01:00
parent f972f32a77 6d9a51cf48
commit f05f20d2d2
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/documentation/components/nav.html
View File

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