Fix rebase

docs/_javascript/main.js

@@ -143,11 +143,11 @@ document.addEventListener('DOMContentLoaded', () => {
       });
     });
 
-    const $highlightShows = getAll('.bd-highlight-clipped .bd-show');
+    const $highlightShows = getAll('.highlight .bd-show');
 
     $highlightShows.forEach($el => {
       $el.addEventListener('click', () => {
-        $el.parentNode.classList.remove('bd-is-clipped');
+        $el.parentNode.parentNode.classList.remove('bd-is-more-clipped');
       });
     });
   }

docs/_sass/example.sass

@@ -210,28 +210,6 @@ $structure-invert: $danger-invert
     pre
       white-space: pre-wrap
 
-.bd-highlight-clipped
-  .bd-show
-    +overlay
-    align-items: center
-    background-color: rgba($background, 0.7)
-    border: none
-    color: rgba(#000, 0.5)
-    cursor: pointer
-    display: none
-    font-size: $size-small
-    justify-content: center
-    width: 100%
-    strong
-      color: currentColor
-      font-weight: $weight-semibold
-    &:hover
-      background-color: rgba($yellow, 0.8)
-      color: rgba(#000, 0.7)
-  +tablet
-    pre
-      white-space: pre-wrap
-
 +tablet
   .section:not(.is-fullwidth) > .bd-example:not(.is-fullwidth)
     margin-left: 1.5rem

docs/documentation/components/navbar.html

@@ -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>

docs/lib/main.js

@@ -115,6 +115,7 @@ document.addEventListener('DOMContentLoaded', function () {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Add show code
 =======
@@ -122,17 +123,22 @@ document.addEventListener('DOMContentLoaded', function () {
 =======
 >>>>>>> Improve snippet
 =======
+>>>>>>> Fix rebase
+=======
 =======
 >>>>>>> Add show code
 >>>>>>> Add show code
 =======
 >>>>>>> Improve snippet
+=======
+>>>>>>> Fix rebase
       var $parent = $el.parentNode;
       if ($parent && $parent.classList.contains('bd-is-more')) {
         var showEl = '<button class="bd-show"><div><span class="icon"><i class="fa fa-code"></i></span> <strong>Show code</strong></div></button>';
         $el.insertAdjacentHTML('beforeend', showEl);
       } else if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
         $el.insertAdjacentHTML('beforeend', expandEl);
+<<<<<<< HEAD
 =======
       if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
         $el.insertAdjacentHTML('beforeend', expandEl);
@@ -179,6 +185,7 @@ document.addEventListener('DOMContentLoaded', function () {
 >>>>>>> Improve snippet
 >>>>>>> Improve snippet
 =======
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> Improve snippet
@@ -201,6 +208,9 @@ document.addEventListener('DOMContentLoaded', function () {
 >>>>>>> Improve snippet
 >>>>>>> Improve snippet
 >>>>>>> Improve snippet
+=======
+>>>>>>> Fix rebase
+>>>>>>> Fix rebase
       }
 
       itemsProcessed++;
@@ -237,12 +247,15 @@ document.addEventListener('DOMContentLoaded', function () {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Improve snippet
 =======
 >>>>>>> Add show code
 =======
 =======
+>>>>>>> Fix rebase
+=======
 >>>>>>> Improve snippet
 >>>>>>> Improve snippet
     var $highlightShows = getAll('.highlight .bd-show');
@@ -274,7 +287,12 @@ document.addEventListener('DOMContentLoaded', function () {
 >>>>>>> Add show code
 =======
 >>>>>>> Improve snippet
+<<<<<<< HEAD
 >>>>>>> Improve snippet
+=======
+=======
+>>>>>>> Fix rebase
+>>>>>>> Fix rebase
     var $highlightShows = getAll('.highlight .bd-show');
 
     $highlightShows.forEach(function ($el) {
@@ -284,6 +302,7 @@ document.addEventListener('DOMContentLoaded', function () {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> Improve snippet
 =======
 =======
@@ -300,6 +319,8 @@ document.addEventListener('DOMContentLoaded', function () {
 >>>>>>> Add show code
 =======
 >>>>>>> Improve snippet
+=======
+>>>>>>> Fix rebase
 >>>>>>> Improve snippet
 =======
 =======
@@ -313,6 +334,8 @@ document.addEventListener('DOMContentLoaded', function () {
 =======
 >>>>>>> Improve snippet
 >>>>>>> Improve snippet
+=======
+>>>>>>> Fix rebase
       });
     });
   }