swedbank-pay-design-guide-jekyll-theme 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ceeee12feb026dc51636613eea16a0acb54b1a6b5dbca8ebd0ff9e14351d1fe
-  data.tar.gz: f60aadc3c877e138bcbd12f0e4530835f55e50b9919626e7f7393dff2b1fceb6
+  metadata.gz: 392bd014e2ad81ab924970029ca0a05b7ca0723c413a3d39cffd7b6600231b88
+  data.tar.gz: 5b04611378f1cc05c57bbbdaaf3771df0391e4a8404476dd3ab6ef8dd5220048
 SHA512:
-  metadata.gz: 77bae9e99eefb895cc20aeba3796592206ef8494eeb7f399891455ae2aee7e45e41dc6a87874842c87abb7891be1cc2ad2608ba8e3cafc73a7a414fe7ca6e83e
-  data.tar.gz: f6d15e7eea3b0365c5ebf15c49124f56195e93071ef5bac27ac44437eef2054f642c5d1dbf3e956693d01bc5da7a8f9a3b2febe2fa9081e0f672180085e1ca79
+  metadata.gz: c83eedbfff55eb0a37eca47eb9e843f46f7b265e38896e50d65335b99e13d23078334246e1f97fa7a409b713fc551a96f2fbe615e6b9f1e7525c541f80bff41f
+  data.tar.gz: 847caad41617699d17b5fc93bf45e9289b2c416b37a462ef24824f974d4aa3a122a593c96abafd4490446e7003ec4bce1af42683abd5dac1c4b56cbf9cfd9b12

data/_layouts/default.html

@@ -88,7 +88,7 @@
                     {% endif %}
                 </div>
                 <div class="d-md-flex">
-                        <div id="dg-sidebar" class="sidebar dg-sidebar">
+                        <div id="dg-sidebar" class="sidebar dg-sidebar has-secondary-nav">
                             <nav class="sidebar-main-nav">
                                 <div class="sidebar-logo">
                                     <a href="/" class="sidebar-header">

data/_sass/accordion-table.scss

@@ -25,6 +25,8 @@
             .hide {
                 display: block;
                 width: 70vw;
+                max-width: 100%;
+                padding-left: 1rem;
             }
         }
 

data/_sass/sidebar.scss

@@ -34,6 +34,8 @@
 
         .main-nav-ul {
             margin-top: 0;
+            height: calc(100vh - 120px);
+            padding: 0 1rem;
         }
     }
 }

data/_sass/swedbank-pay-design-guide-theme.scss

@@ -330,10 +330,15 @@ body {
             }
 
             code {
-                border: 2px solid $yellow;
+                border: 1px solid $yellow;
+                border-radius: 8px;
             }
         }
 
+        .field-level-0::before {
+            content: '';
+        }
+
         .field-level-2 {
             margin-left: 2rem;
         }

data/lib/field_tag.rb

@@ -38,9 +38,14 @@ module SwedbankPay
     def level(values)
       return 1 if values.size == 1
 
-      field_level = values[1].strip.to_i
+      field_level = values[1].strip
 
-      field_level.positive? ? field_level : 1
+      # Check if the level is a valid number, otherwise default to 1
+      return 1 unless /\A[-+]?\d*\.?\d+\z/.match(field_level)
+
+      field_level = field_level.to_i
+
+      field_level >= 0 ? field_level : 1
     rescue StandardError
       1
     end

data/lib/gem_version.rb

@@ -4,7 +4,7 @@ module Gem
   # Gem Specification
   class Specification
     def self.gem_version
-      '2.1.2'
+      '2.1.4'
     end
   end
 end

data/lib/sidebar_html_builder.rb

@@ -38,6 +38,10 @@ module SwedbankPay
         markup << item_markup(page, current_page, sub_items_markup, false)
       end
 
+      # We need to wait with the root class replacement until here because
+      # earlier in the process, the page HTML isn't loaded yet.
+      change_root_class(current_page)
+
       markup
     end
 
@@ -47,9 +51,6 @@ module SwedbankPay
       level = is_leaf ? -1 : page.level
       title_markup = title_markup(page, level, is_leaf)
       item_class = item_class(page, current_page, level, is_leaf)
-      root_class = root_class(page, current_page)
-      level.zero? &&
-        page.doc.xpath('//*[@id="dg-sidebar"]').first.set_attribute('class', root_class)
       "<li class=\"#{item_class}\">
           #{title_markup}
           #{if item_class === 'main-nav-li' || item_class === 'main-nav-li active'
@@ -63,9 +64,11 @@ module SwedbankPay
         </li>"
     end
 
-    def root_class(page, current_page)
-      active = page.active?(current_page)
-      active && current_page.path != '/' ? 'sidebar dg-sidebar has-secondary-nav' : 'sidebar dg-sidebar'
+    def change_root_class(current_page)
+      return if current_page.path != '/'
+
+      # On 'home', set the 'class' to 'sidebar dg-sidebar' to effectively remove 'has-secondary-nav'.
+      current_page.doc.xpath('//*[@id="dg-sidebar"]').first.set_attribute('class', 'sidebar dg-sidebar')
     end
 
     def item_class(page, current_page, level, is_leaf)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swedbank-pay-design-guide-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday