Fix tabs

CHANGELOG.md

@@ -21,6 +21,8 @@
 * Deprecate `.menu-nav`
 * Add invert outlined buttons
 * Fix `.nav`
+* Fix `.pagination`
+* Fix `.tabs`
 
 ## 0.2.2
 

docs/css/bulma-docs.css

@@ -4316,8 +4316,8 @@ a.panel-block:hover {
   user-select: none;
   align-items: stretch;
   display: flex;
+  font-size: 1rem;
   justify-content: space-between;
-  line-height: 24px;
   overflow: hidden;
   overflow-x: auto;
   white-space: nowrap;
@@ -4334,7 +4334,7 @@ a.panel-block:hover {
   display: flex;
   justify-content: center;
   margin-bottom: -1px;
-  padding: 6px 12px;
+  padding: 0.5em 1em;
   vertical-align: top;
 }
 
@@ -4362,27 +4362,27 @@ a.panel-block:hover {
 }
 
 .tabs ul.is-left {
-  padding-right: 10px;
+  padding-right: 0.75em;
 }
 
 .tabs ul.is-center {
   flex: none;
   justify-content: center;
-  padding-left: 10px;
-  padding-right: 10px;
+  padding-left: 0.75em;
+  padding-right: 0.75em;
 }
 
 .tabs ul.is-right {
   justify-content: flex-end;
-  padding-left: 10px;
+  padding-left: 0.75em;
 }
 
 .tabs .icon:first-child {
-  margin-right: 8px;
+  margin-right: 0.5em;
 }
 
 .tabs .icon:last-child {
-  margin-left: 8px;
+  margin-left: 0.5em;
 }
 
 .tabs.is-centered ul {
@@ -4396,8 +4396,6 @@ a.panel-block:hover {
 .tabs.is-boxed a {
   border: 1px solid transparent;
   border-radius: 3px 3px 0 0;
-  padding-bottom: 5px;
-  padding-top: 5px;
 }
 
 .tabs.is-boxed a:hover {
@@ -4419,8 +4417,6 @@ a.panel-block:hover {
 .tabs.is-toggle a {
   border: 1px solid #dbdbdb;
   margin-bottom: 0;
-  padding-bottom: 5px;
-  padding-top: 5px;
   position: relative;
 }
 
@@ -4457,41 +4453,14 @@ a.panel-block:hover {
   font-size: 0.75rem;
 }
 
-.tabs.is-small a {
-  padding: 2px 8px;
-}
-
-.tabs.is-small.is-boxed a, .tabs.is-small.is-toggle a {
-  padding-bottom: 1px;
-  padding-top: 1px;
-}
-
 .tabs.is-medium {
   font-size: 1.25rem;
 }
 
-.tabs.is-medium a {
-  padding: 10px 16px;
-}
-
-.tabs.is-medium.is-boxed a, .tabs.is-medium.is-toggle a {
-  padding-bottom: 9px;
-  padding-top: 9px;
-}
-
 .tabs.is-large {
   font-size: 1.5rem;
 }
 
-.tabs.is-large a {
-  padding: 14px 20px;
-}
-
-.tabs.is-large.is-boxed a, .tabs.is-large.is-toggle a {
-  padding-bottom: 13px;
-  padding-top: 13px;
-}
-
 .column {
   display: block;
   flex-basis: 0;

docs/documentation/components/pagination.html

@@ -94,18 +94,6 @@ doc-subtab: pagination
     <li>
       <a class="pagination-link">3</a>
     </li>
-    <li>
-      <a class="pagination-link">4</a>
-    </li>
-    <li>
-      <a class="pagination-link">5</a>
-    </li>
-    <li>
-      <span class="pagination-ellipsis">&hellip;</span>
-    </li>
-    <li>
-      <a class="pagination-link">86</a>
-    </li>
   </ul>
 </nav>
 {% endcapture %}

docs/documentation/components/tabs.html

@@ -18,17 +18,7 @@ doc-subtab: tabs
         The <strong>default</strong> tabs style has a single border at the bottom.</p>
     </div>
 
-<div class="example">
-  <div class="tabs">
-    <ul>
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-  </div>
-</div>
-{% highlight html %}
+{% capture tabs_example %}
 <div class="tabs">
   <ul>
     <li class="is-active"><a>Pictures</a></li>
@@ -37,29 +27,23 @@ doc-subtab: tabs
     <li><a>Documents</a></li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_example}}
+</div>
+{% highlight html %}
+{{tabs_example}}
 {% endhighlight %}
 
     <hr>
 
     <h3 class="title">Alignment</h3>
-
     <div class="content">
       <p>
         To align the tabs list, use the <code>is-centered</code> or <code>is-right</code> modifier on the <code>.tabs</code> container:
       </p>
     </div>
-
-<div class="example">
-  <div class="tabs is-centered">
-    <ul>
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-  </div>
-</div>
-{% highlight html %}
+{% capture tabs_centered_example %}
 <div class="tabs is-centered">
   <ul>
     <li class="is-active"><a>Pictures</a></li>
@@ -68,20 +52,15 @@ doc-subtab: tabs
     <li><a>Documents</a></li>
   </ul>
 </div>
-{% endhighlight %}
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs is-right">
-    <ul>
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-  </div>
+{{tabs_centered_example}}
 </div>
-
 {% highlight html %}
+{{tabs_centered_example}}
+{% endhighlight %}
+
+{% capture tabs_right_example %}
 <div class="tabs is-right">
   <ul>
     <li class="is-active"><a>Pictures</a></li>
@@ -90,97 +69,22 @@ doc-subtab: tabs
     <li><a>Documents</a></li>
   </ul>
 </div>
-{% endhighlight %}
-
-    <div class="content">
-      <p>
-        To have several lists aligned differently, use one of <strong>3 modifiers</strong> on the <code>ul</code>:
-      </p>
-      <ul>
-        <li><code>is-left</code></li>
-        <li><code>is-center</code></li>
-        <li><code>is-right</code></li>
-      </ul>
-    </div>
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs">
-    <ul class="is-left">
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-    <ul class="is-center">
-      <li><a>Previous</a></li>
-      <li><a>Up</a></li>
-      <li><a>Next</a></li>
-    </ul>
-    <ul class="is-right">
-      <li><a>Search</a></li>
-    </ul>
-  </div>
+{{tabs_right_example}}
 </div>
-
 {% highlight html %}
-<div class="tabs">
-  <ul class="is-left">
-    <li class="is-active"><a>Pictures</a></li>
-    <li><a>Music</a></li>
-    <li><a>Videos</a></li>
-    <li><a>Documents</a></li>
-  </ul>
-  <ul class="is-center">
-    <li><a>Previous</a></li>
-    <li><a>Up</a></li>
-    <li><a>Next</a></li>
-  </ul>
-  <ul class="is-right">
-    <li><a>Search</a></li>
-  </ul>
-</div>
+{{tabs_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">
-  <div class="tabs is-centered">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon is-small"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-{% highlight html %}
+{% capture tabs_icons_example %}
 <div class="tabs is-centered">
   <ul>
     <li class="is-active">
@@ -209,6 +113,12 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_icons_example}}
+</div>
+{% highlight html %}
+{{tabs_icons_example}}
 {% endhighlight %}
 
     <hr>
@@ -217,19 +127,7 @@ doc-subtab: tabs
     <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">
-  <div class="tabs is-small">
-    <ul>
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-  </div>
-</div>
-
-{% highlight html %}
+{% capture tabs_small_example %}
 <div class="tabs is-small">
   <ul>
     <li class="is-active"><a>Pictures</a></li>
@@ -238,20 +136,15 @@ doc-subtab: tabs
     <li><a>Documents</a></li>
   </ul>
 </div>
-{% endhighlight %}
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs is-medium">
-    <ul>
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-  </div>
+{{tabs_small_example}}
 </div>
-
 {% highlight html %}
+{{tabs_small_example}}
+{% endhighlight %}
+
+{% capture tabs_medium_example %}
 <div class="tabs is-medium">
   <ul>
     <li class="is-active"><a>Pictures</a></li>
@@ -260,20 +153,15 @@ doc-subtab: tabs
     <li><a>Documents</a></li>
   </ul>
 </div>
-{% endhighlight %}
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs is-large">
-    <ul>
-      <li class="is-active"><a>Pictures</a></li>
-      <li><a>Music</a></li>
-      <li><a>Videos</a></li>
-      <li><a>Documents</a></li>
-    </ul>
-  </div>
+{{tabs_medium_example}}
 </div>
-
 {% highlight html %}
+{{tabs_medium_example}}
+{% endhighlight %}
+
+{% capture tabs_large_example %}
 <div class="tabs is-large">
   <ul>
     <li class="is-active"><a>Pictures</a></li>
@@ -282,6 +170,12 @@ doc-subtab: tabs
     <li><a>Documents</a></li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_large_example}}
+</div>
+{% highlight html %}
+{{tabs_large_example}}
 {% endhighlight %}
 
     <hr>
@@ -290,39 +184,7 @@ doc-subtab: tabs
     <div class="content">
       If you want a more classic style with <strong>borders</strong>, just append the <code>is-boxed</code> modifier.
     </div>
-
-<div class="example">
-  <div class="tabs is-boxed">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon is-small"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-{% highlight html %}
+{% capture tabs_boxed_example %}
 <div class="tabs is-boxed">
   <ul>
     <li class="is-active">
@@ -351,44 +213,18 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_boxed_example}}
+</div>
+{% highlight html %}
+{{tabs_boxed_example}}
 {% endhighlight %}
 
     <p class="content">
       If you want <strong>mutually exclusive</strong> tabs (like radio buttons where clicking one deselects all other ones), use the <code>is-toggle</code> modifier.
     </p>
-
-<div class="example">
-  <div class="tabs is-toggle">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon is-small"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-{% highlight html %}
+{% capture tabs_toggle_example %}
 <div class="tabs is-toggle">
   <ul>
     <li class="is-active">
@@ -400,53 +236,35 @@ doc-subtab: tabs
     <li>
       <a>
         <span class="icon is-small"><i class="fa fa-music"></i></span>
-        Music
+        <span>Music</span>
       </a>
     </li>
     <li>
       <a>
         <span class="icon is-small"><i class="fa fa-film"></i></span>
-        Videos
+        <span>Videos</span>
       </a>
     </li>
     <li>
       <a>
         <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-        Documents
+        <span>Documents</span>
       </a>
     </li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_toggle_example}}
+</div>
+{% highlight html %}
+{{tabs_toggle_example}}
 {% endhighlight %}
 
     <p class="content">
       If you want the tabs to take up the <strong>whole width</strong> available, use <code>is-fullwidth</code>.
     </p>
-    <div class="example">
-      <div class="tabs is-fullwidth">
-        <ul>
-          <li>
-            <a>
-              <span class="icon"><i class="fa fa-angle-left"></i></span>
-              <span>Left</span>
-            </a>
-          </li>
-          <li>
-            <a>
-              <span class="icon"><i class="fa fa-angle-up"></i></span>
-              <span>Up</span>
-            </a>
-          </li>
-          <li>
-            <a>
-              <span>Right</span>
-              <span class="icon"><i class="fa fa-angle-right"></i></span>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-{% highlight html %}
+{% capture tabs_fullwidth_example %}
 <div class="tabs is-fullwidth">
   <ul>
     <li>
@@ -469,6 +287,12 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_fullwidth_example}}
+</div>
+{% highlight html %}
+{{tabs_fullwidth_example}}
 {% endhighlight %}
 
     <hr>
@@ -477,39 +301,7 @@ doc-subtab: tabs
     <div class="content">
       <p>You can <strong>combine</strong> different modifiers. For example, you can have <strong>centered boxed</strong> tabs, or <strong>fullwidth toggle</strong> ones.</p>
     </div>
-
-<div class="example">
-  <div class="tabs is-centered is-boxed">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon is-small"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-{% highlight html %}
+{% capture tabs_centered_boxed_example %}
 <div class="tabs is-centered is-boxed">
   <ul>
     <li class="is-active">
@@ -538,40 +330,15 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
-{% endhighlight %}
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs is-toggle is-fullwidth">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon is-small"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
+{{tabs_centered_boxed_example}}
 </div>
-
 {% highlight html %}
+{{tabs_centered_boxed_example}}
+{% endhighlight %}
+
+{% capture toggle_fullwidth_example %}
 <div class="tabs is-toggle is-fullwidth">
   <ul>
     <li class="is-active">
@@ -600,40 +367,15 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
-{% endhighlight %}
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs is-centered is-boxed is-medium">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon is-small"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon is-small"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
+{{tabs_toggle_fullwidth_example}}
 </div>
-
 {% highlight html %}
+{{tabs_toggle_fullwidth_example}}
+{% endhighlight %}
+
+{% capture tabs_centered_boxed_medium_example %}
 <div class="tabs is-centered is-boxed is-medium">
   <ul>
     <li class="is-active">
@@ -662,40 +404,15 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
-{% endhighlight %}
-
+{% endcapture %}
 <div class="example">
-  <div class="tabs is-toggle is-fullwidth is-large">
-    <ul>
-      <li class="is-active">
-        <a>
-          <span class="icon"><i class="fa fa-image"></i></span>
-          <span>Pictures</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon"><i class="fa fa-music"></i></span>
-          <span>Music</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon"><i class="fa fa-film"></i></span>
-          <span>Videos</span>
-        </a>
-      </li>
-      <li>
-        <a>
-          <span class="icon"><i class="fa fa-file-text-o"></i></span>
-          <span>Documents</span>
-        </a>
-      </li>
-    </ul>
-  </div>
+{{tabs_centered_boxed_medium_example}}
 </div>
-
 {% highlight html %}
+{{tabs_centered_boxed_medium_example}}
+{% endhighlight %}
+
+{% capture tabs_toggle_fullwidth_large_example %}
 <div class="tabs is-toggle is-fullwidth is-large">
   <ul>
     <li class="is-active">
@@ -724,6 +441,12 @@ doc-subtab: tabs
     </li>
   </ul>
 </div>
+{% endcapture %}
+<div class="example">
+{{tabs_toggle_fullwidth_large_example}}
+</div>
+{% highlight html %}
+{{tabs_toggle_fullwidth_large_example}}
 {% endhighlight %}
 
   </div>

sass/components/tabs.sass

@@ -3,8 +3,8 @@
   +unselectable
   align-items: stretch
   display: flex
+  font-size: $size-normal
   justify-content: space-between
-  line-height: 24px
   overflow: hidden
   overflow-x: auto
   white-space: nowrap
@@ -15,7 +15,7 @@
     display: flex
     justify-content: center
     margin-bottom: -1px
-    padding: 6px 12px
+    padding: 0.5em 1em
     vertical-align: top
     &:hover
       border-bottom-color: $text-strong
@@ -34,20 +34,20 @@
     flex-shrink: 0
     justify-content: flex-start
     &.is-left
-      padding-right: 10px
+      padding-right: 0.75em
     &.is-center
       flex: none
       justify-content: center
-      padding-left: 10px
-      padding-right: 10px
+      padding-left: 0.75em
+      padding-right: 0.75em
     &.is-right
       justify-content: flex-end
-      padding-left: 10px
+      padding-left: 0.75em
   .icon
     &:first-child
-      margin-right: 8px
+      margin-right: 0.5em
     &:last-child
-      margin-left: 8px
+      margin-left: 0.5em
   // Alignment
   &.is-centered
     ul
@@ -60,8 +60,6 @@
     a
       border: 1px solid transparent
       border-radius: $radius $radius 0 0
-      padding-bottom: 5px
-      padding-top: 5px
       &:hover
         background-color: $background
         border-bottom-color: $border
@@ -79,8 +77,6 @@
     a
       border: 1px solid $border
       margin-bottom: 0
-      padding-bottom: 5px
-      padding-top: 5px
       position: relative
       &:hover
         background-color: $background
@@ -104,28 +100,7 @@
   // Sizes
   &.is-small
     font-size: $size-small
-    a
-      padding: 2px 8px
-    &.is-boxed,
-    &.is-toggle
-      a
-        padding-bottom: 1px
-        padding-top: 1px
   &.is-medium
     font-size: $size-medium
-    a
-      padding: 10px 16px
-    &.is-boxed,
-    &.is-toggle
-      a
-        padding-bottom: 9px
-        padding-top: 9px
   &.is-large
     font-size: $size-large
-    a
-      padding: 14px 20px
-    &.is-boxed,
-    &.is-toggle
-      a
-        padding-bottom: 13px
-        padding-top: 13px