From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Sun, 2 Jul 2017 23:17:42 +0000 (+0100)
Subject: Fix #827
X-Git-Tag: 0.4.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0382506bde4e31828af9e26239b585efb9ef87a5;p=thirdparty%2Fbulma.git

Fix #827
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17b6e66d0..e5cb0e48c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 ### Issues closed
 
+* Fix #827 Breadcrumb and Navbar in docs
 * Fix #824 Code examples broken because of `text-align: center`
 * Fix #820 Loading spinner resizes with controls
 * Fix #819 Remove `height: auto` from media elements
diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html
index db13302c5..bbf557e2d 100644
--- a/docs/_includes/navbar.html
+++ b/docs/_includes/navbar.html
@@ -45,9 +45,15 @@
           <a class="navbar-item {% if page.doc-tab == 'elements' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/box/">
             Elements
           </a>
-          <a class="navbar-item {% if page.doc-tab == 'components' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/breadcrumb/">
-            Components
-          </a>
+          {% if site.vernum >= 50 %}
+            <a class="navbar-item {% if page.doc-tab == 'components' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/breadcrumb/">
+              Components
+            </a>
+          {% else %}
+            <a class="navbar-item {% if page.doc-tab == 'components' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/card/">
+              Components
+            </a>
+          {% endif %}
           <a class="navbar-item {% if page.doc-tab == 'layout' %}is-active{% endif %}" href="{{ site.url }}/documentation/layout/container/">
             Layout
           </a>
diff --git a/docs/_includes/subnav-components.html b/docs/_includes/subnav-components.html
index df898de3b..db93c29f1 100644
--- a/docs/_includes/subnav-components.html
+++ b/docs/_includes/subnav-components.html
@@ -1,9 +1,12 @@
 <nav class="nav has-shadow">
   <div class="container">
     <div class="nav-left">
-      <a class="nav-item is-tab {% if page.doc-subtab == 'breadcrumb' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/breadcrumb/">
-        Breadcrumb
-      </a>
+      {% if site.vernum >= 50 %}
+        <a class="nav-item is-tab {% if page.doc-subtab == 'breadcrumb' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/breadcrumb/">
+          Breadcrumb
+          <span class="tag is-success" style="margin-left: 0.5rem;">New!</span>
+        </a>
+      {% endif %}
       <a class="nav-item is-tab {% if page.doc-subtab == 'card' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/card/">
         Card
       </a>
@@ -22,10 +25,16 @@
       <a class="nav-item is-tab {% if page.doc-subtab == 'modal' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/modal/">
         Modal
       </a>
-      <a class="nav-item is-tab {% if page.doc-subtab == 'navbar' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/navbar/">
-        Navbar
-        <span class="tag is-success" style="margin-left: 0.5rem;">New!</span>
-      </a>
+      {% if site.vernum >= 50 %}
+        <a class="nav-item is-tab {% if page.doc-subtab == 'navbar' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/navbar/">
+          Navbar
+          <span class="tag is-success" style="margin-left: 0.5rem;">New!</span>
+        </a>
+      {% else %}
+        <a class="nav-item is-tab {% if page.doc-subtab == 'nav' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/nav/">
+          Nav
+        </a>
+      {% endif %}
       <a class="nav-item is-tab {% if page.doc-subtab == 'pagination' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/pagination/">
         Pagination
       </a>
diff --git a/docs/_layouts/documentation.html b/docs/_layouts/documentation.html
index 4034caec7..4caa68237 100644
--- a/docs/_layouts/documentation.html
+++ b/docs/_layouts/documentation.html
@@ -43,7 +43,11 @@ route: documentation
             <a href="{{ site.url }}/documentation/elements/box/">Elements</a>
           </li>
           <li {% if page.doc-tab == 'components' %}class="is-active"{% endif %}>
-            <a href="{{ site.url }}/documentation/components/breadcrumb/">Components</a>
+            {% if site.vernum >= 50 %}
+              <a href="{{ site.url }}/documentation/components/breadcrumb/">Components</a>
+            {% else %}
+              <a href="{{ site.url }}/documentation/components/card/">Components</a>
+            {% endif %}
           </li>
           <li {% if page.doc-tab == 'layout' %}class="is-active"{% endif %}>
             <a href="{{ site.url }}/documentation/layout/container/">Layout</a>
diff --git a/docs/documentation/components/breadcrumb.html b/docs/documentation/components/breadcrumb.html
index 73cdd1be4..3aa475ef1 100644
--- a/docs/documentation/components/breadcrumb.html
+++ b/docs/documentation/components/breadcrumb.html
@@ -6,234 +6,252 @@ doc-subtab: breadcrumb
 
 {% include subnav-components.html %}
 
-<section class="section">
-    <div class="container">
-        <h1 class="title">Breadcrumb</h1>
-        <h2 class="subtitle">A simple breadcrumb component to improve your navigation experience</h2>
-
-        <hr>
-
-        <div class="content">
-            <p>The <strong>breadcrumb</strong> component only requires a <code>.breadcrumb</code> container and a <code>ul</code> list.</p>
-            <p>The dividers are automatically created in the content of the <code>::before</code> pseudo-element of <code>li</code> tags.</p>
-            <p>You can inform the current page using the <code>is-active</code> modifier in a <code>li</code> tag. It will disable the navigation of inner links.</p>
-        </div>
-
-        <hr>
-
 {% capture breadcrumb_example %}
 <nav class="breadcrumb">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_example}}
-{% endhighlight %}
-
-<hr>
-
-<h3 class="title">Alignment</h3>
-<div class="content">
-    <p>For alternative alignments, use the <code>is-centered</code> and <code>is-right</code> modifiers on the <code>.breadcrumb</code> container.</p>
-</div>
 
 {% capture breadcrumb_centered_example %}
 <nav class="breadcrumb is-centered">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_centered_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_centered_example}}
-{% endhighlight %}
 
 {% capture breadcrumb_right_example %}
 <nav class="breadcrumb is-right">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_right_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_right_example}}
-{% endhighlight %}
-
-<hr>
-
-<h3 class="title">Icons</h3>
-<div class="content">
-    <p>You can use any of the <a href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a> <strong>icons</strong>.</p>
-</div>
 
 {% capture breadcrumb_icons_example %}
 <nav class="breadcrumb">
-    <ul>
-        <li><a><span class="icon is-small"><i class="fa fa-home"></i></span><span>Bulma</span></a></li>
-        <li><a><span class="icon is-small"><i class="fa fa-book"></i></span><span>Documentation</span></a></li>
-        <li><a><span class="icon is-small"><i class="fa fa-puzzle-piece"></i></span><span>Components</span></a></li>
-        <li class="is-active"><a><span class="icon is-small"><i class="fa fa-thumbs-up"></i></span><span>Breadcrumb</span></a></li>
-    </ul>
+  <ul>
+    <li><a><span class="icon is-small"><i class="fa fa-home"></i></span><span>Bulma</span></a></li>
+    <li><a><span class="icon is-small"><i class="fa fa-book"></i></span><span>Documentation</span></a></li>
+    <li><a><span class="icon is-small"><i class="fa fa-puzzle-piece"></i></span><span>Components</span></a></li>
+    <li class="is-active"><a><span class="icon is-small"><i class="fa fa-thumbs-up"></i></span><span>Breadcrumb</span></a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_icons_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_icons_example}}
-{% endhighlight %}
-
-<hr>
-
-<h3 class="title">Sizes</h3>
-<div class="content">
-    <p>You can choose between <strong>3 additional sizes</strong>: <code>is-small</code> <code>is-medium</code> and <code>is-large</code>.</p>
-</div>
+
 {% capture breadcrumb_small_example %}
 <nav class="breadcrumb is-small">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_small_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_small_example}}
-{% endhighlight %}
 
 {% capture breadcrumb_medium_example %}
 <nav class="breadcrumb is-medium">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_medium_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_medium_example}}
-{% endhighlight %}
 
 {% capture breadcrumb_large_example %}
 <nav class="breadcrumb is-large">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_large_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_large_example}}
-{% endhighlight %}
-
-<hr>
-
-<h3 class="title">Alternative separators</h3>
-<div class="content">
-    <p>You can choose between <strong>4 additional separators</strong>: <code>has-arrow-separator</code> <code>has-bullet-separator</code> <code>has-dot-separator</code> and <code>has-succeeds-separator</code>.</p>
-</div>
+
 {% capture breadcrumb_arrow_example %}
 <nav class="breadcrumb has-arrow-separator">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_arrow_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_arrow_example}}
-{% endhighlight %}
 
 {% capture breadcrumb_bullet_example %}
 <nav class="breadcrumb has-bullet-separator">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_bullet_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_bullet_example}}
-{% endhighlight %}
 
 {% capture breadcrumb_dot_example %}
 <nav class="breadcrumb has-dot-separator">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_dot_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_dot_example}}
-{% endhighlight %}
 
 {% capture breadcrumb_succeeds_example %}
 <nav class="breadcrumb has-succeeds-separator">
-    <ul>
-        <li><a>Bulma</a></li>
-        <li><a>Documentation</a></li>
-        <li><a>Components</a></li>
-        <li class="is-active"><a>Breadcrumb</a></li>
-    </ul>
+  <ul>
+    <li><a>Bulma</a></li>
+    <li><a>Documentation</a></li>
+    <li><a>Components</a></li>
+    <li class="is-active"><a>Breadcrumb</a></li>
+  </ul>
 </nav>
 {% endcapture %}
-<div class="example">
-{{breadcrumb_succeeds_example}}
-</div>
-{% highlight html %}
-{{breadcrumb_succeeds_example}}
-{% endhighlight %}
 
+<section class="section">
+  <div class="container">
+
+    <div class="columns" style="margin-bottom: -0.75rem !important;">
+      <div class="column">
+        <h1 class="title">Breadcrumb</h1>
+        <h2 class="subtitle">
+          A simple <strong>breadcrumb</strong> component to improve your navigation experience
+        </h2>
+      </div>
+
+      <div class="column is-narrow">
+        <p class="content">
+          <span class="tag is-success">New!</span>
+          <span class="tag is-info">0.5.0</span>
+        </p>
+      </div>
+    </div>
+
+    <hr>
+
+    <div class="content">
+      <p>The <strong>breadcrumb</strong> component only requires a <code>.breadcrumb</code> container and a <code>ul</code> list.</p>
+      <p>The dividers are automatically created in the content of the <code>::before</code> pseudo-element of <code>li</code> tags.</p>
+      <p>You can inform the current page using the <code>is-active</code> modifier in a <code>li</code> tag. It will disable the navigation of inner links.</p>
+    </div>
+
+    <hr>
+    <div class="example">
+      {{breadcrumb_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_example}}{% endhighlight %}
+
+    <hr>
+
+    <h3 class="title">Alignment</h3>
+    <div class="content">
+      <p>For alternative alignments, use the <code>is-centered</code> and <code>is-right</code> modifiers on the <code>.breadcrumb</code> container.</p>
+    </div>
+
+
+    <div class="example">
+      {{breadcrumb_centered_example}}
+    </div>
+
+
+    {% highlight html %}{{breadcrumb_centered_example}}{% endhighlight %}
+
+    <div class="example">
+      {{breadcrumb_right_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_right_example}}{% endhighlight %}
 
+    <hr>
+
+    <h3 class="title">Icons</h3>
+
+    <div class="content">
+      <p>You can use any of the <a href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a> <strong>icons</strong>.</p>
+    </div>
+
+    <div class="example">
+      {{breadcrumb_icons_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_icons_example}}{% endhighlight %}
+
+    <hr>
+
+    <h3 class="title">Sizes</h3>
+
+    <div class="content">
+      <p>You can choose between <strong>3 additional sizes</strong>: <code>is-small</code> <code>is-medium</code> and <code>is-large</code>.</p>
+    </div>
+
+    <div class="example">
+      {{breadcrumb_small_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_small_example}}{% endhighlight %}
+
+    <div class="example">
+      {{breadcrumb_medium_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_medium_example}}{% endhighlight %}
+
+    <div class="example">
+      {{breadcrumb_large_example}}
     </div>
+
+    {% highlight html %}{{breadcrumb_large_example}}{% endhighlight %}
+
+    <hr>
+
+    <h3 class="title">Alternative separators</h3>
+    <div class="content">
+      <p>You can choose between <strong>4 additional separators</strong>: <code>has-arrow-separator</code> <code>has-bullet-separator</code> <code>has-dot-separator</code> and <code>has-succeeds-separator</code>.</p>
+    </div>
+
+    <div class="example">
+      {{breadcrumb_arrow_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_arrow_example}}{% endhighlight %}
+
+    <div class="example">
+      {{breadcrumb_bullet_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_bullet_example}}{% endhighlight %}
+
+    <div class="example">
+      {{breadcrumb_dot_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_dot_example}}{% endhighlight %}
+
+    <div class="example">
+      {{breadcrumb_succeeds_example}}
+    </div>
+
+    {% highlight html %}{{breadcrumb_succeeds_example}}{% endhighlight %}
+
+  </div>
 </section>
diff --git a/docs/documentation/components/nav.html b/docs/documentation/components/nav.html
index 4449db88a..a69afd948 100644
--- a/docs/documentation/components/nav.html
+++ b/docs/documentation/components/nav.html
@@ -9,17 +9,19 @@ doc-subtab: nav
 <section class="section">
   <div class="container">
 
-  <div class="message is-danger">
-    <div class="message-body">
-      <p>This component has been <strong>deprecated</strong> and will be deleted soon.</p>
-    </div>
-  </div>
+    {% if site.vernum >= 50 %}
+      <div class="message is-danger">
+        <div class="message-body">
+          <p>This component has been <strong>deprecated</strong> and will be deleted soon.</p>
+        </div>
+      </div>
 
-  <div class="message is-info">
-    <div class="message-body">
-      <p>While both <code>.nav</code> and <code>.navbar</code> currently co-exist to ensure backwards compatibility, the <code>.nav</code> will probably be deleted in an upcoming update, so you should start using <a href="{{ site.url }}/documentation/components/navbar/">the new navbar</a> instead.</p>
-    </div>
-  </div>
+      <div class="message is-info">
+        <div class="message-body">
+          <p>While both <code>.nav</code> and <code>.navbar</code> currently co-exist to ensure backwards compatibility, the <code>.nav</code> will probably be deleted in an upcoming update, so you should start using <a href="{{ site.url }}/documentation/components/navbar/">the new navbar</a> instead.</p>
+        </div>
+      </div>
+    {% endif %}
 
     <h1 class="title">Nav</h1>
     <h2 class="subtitle">