swedbank-pay-design-guide-jekyll-theme 1.9.9 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d2b335743d0a94cb65044496633ed1ce67af7a5771947daa2d4d4226b07868
-  data.tar.gz: fe9ac409a1d26ef80fa259c7366ccffbfd915e071c9b0398b63961b3d9642439
+  metadata.gz: 9d75a81c46fdd8b54db9bdedbd6f2ab116f3c5b39da55fe1e394b1194a44ecff
+  data.tar.gz: a5f07b043e51424f139e61eb40aac49f227a26dfd9b3976e634882836d2bd2d2
 SHA512:
-  metadata.gz: 18b0518c041bca19cd867b5abda56dc60e45de2a38c925819d6e0eb88205bd65024e75eb41b875af2cafb57812a89854de644e00c1e5f70666d4c8604cce57bd
-  data.tar.gz: d0f3d78eb5c9071d223596f2dea1cfa145c3ceb69a568ff66ba01285473194ef43c6c0c2f94a253ddfdb3c9f9f66997a86f8216735cb21b8dc57a6e6e2c0ce9e
+  metadata.gz: eb181bd3f5a33e421344f7dfa84991551dd3897a10f0cb3dbaaede72007ac4008d347d925e6b38290f8451e770bb59ffb1c8a2cf74210357118f2a9ce52755ee
+  data.tar.gz: d96ffc9da54916d3dbdc9cf8319e0091ccedcd37a6ab7488b4adecccfe2fc1423cde1b8a86a0d62fc95654b7afc1d03106eeacbd529319d7f55b7a74226f7207

data/_includes/card-list.html

@@ -7,22 +7,25 @@ type: sdk | module - Empty type result in default card styling
 col_class(required): Describes what grid column class(es) each card should be wrapped in
 {%- endcomment -%}
 
-{% assign card_list = include.card_list %}
-{% assign type = include.type %}
-{% assign col_class = include.col_class %}
-
 <div class="row card-list">
-    {% for card in card_list %}
+    {% for card in include.card_list %}
         {% assign title = card.title | split: '–' | last %}
-        <div class="{{ col_class }}">
-            {% include card.html title=title
+        {% assign link_to = card.extensionless_path | default: card.url %}
+        {% assign card_type = card.card_type | default: include.type %}
+        {% assign icon_content = card.card.icon.content | default: card.icon.content %}
+        {% assign icon_outlined = card.card.icon.outlined | default: card.icon.outlined %}
+        {% assign icon_svg = card.card.icon.svg | default: card.icon.svg %}
+
+        <div class="{{ include.col_class }}">
+            {% include card.html
+                title=title
                 text=card.description
-                icon_content=card.icon.content
-                icon_outlined=card.icon.outlined
-                icon_svg=card.icon.svg
-                to=card.url
-                type=type
+                icon_content=icon_content
+                icon_outlined=icon_outlined
+                icon_svg=icon_svg
+                to=link_to
+                type=card_type
             %}
         </div>
     {% endfor %}
-</div>
+</div>

data/_includes/card-overview.html

@@ -0,0 +1,12 @@
+{% for child in page.children %}
+    {% if child.children && child.children.size > 0 %}
+        {% capture header %}
+{:.heading-line}
+## {{ child.title }}
+        {% endcapture %}
+        {% assign header =  header | markdownify %}
+        {% include anchor_headings.html html=header anchorClass='header-anchor' %}
+        {% assign col_class = child.card.col_class | default: 'col-lg-4' %}
+        {% include card-list.html card_list=child.children col_class=col_class %}
+    {% endif %}
+{% endfor %}

data/_includes/doc-container.html

@@ -0,0 +1,19 @@
+{% capture max_width_class %}
+    {% if page.layout == 'front-page' %}
+        no-padding
+    {% elsif page.card_overview %}
+        normal-padding max-width-card-overview
+    {% else %}
+        normal-padding max-width
+    {% endif %}
+{% endcapture %}
+
+<div class="doc-container {{ max_width_class | strip }}">
+    <article>
+        {% if page.card_overview %}
+            {% include card-overview.html %}
+        {% else %}
+            {% include anchor_headings.html html=content anchorClass='header-anchor' %}
+        {% endif %}
+    </article>
+</div>

data/_includes/google_analytics.html

@@ -1,9 +1,8 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics.tracking_id }}"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '{{ site.google_analytics.tracking_id }}');
-</script>
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics.tracking_id }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){ dataLayer.push(arguments); }
+  gtag('js', new Date());
+  gtag('config', '{{ site.google_analytics.tracking_id }}', { 'anonymize_ip': true });
+</script>

data/_layouts/default.html

@@ -95,14 +95,7 @@
                         {% if page.layout != 'front-page' %}
                             {% include title-header.html %}
                         {% endif %}
-                        <div class="doc-container{% if page.layout == 'front-page' %} no-padding
-                            {% elsif page.card_overview %} normal-padding max-width-card-overview
-                            {% else %} normal-padding max-width
-                            {% endif %}">
-                            <article>
-                                {% include anchor_headings.html html=content anchorClass='header-anchor' %}
-                            </article>
-                        </div>
+                        {% include doc-container.html %}
                     </main>
                 </div>
             </div>
@@ -110,7 +103,7 @@
         <script src="{{ design_guide_url }}/scripts/dg.js"></script>
         <script src="{{ '/assets/js/swedbank-pay-design-guide-theme.js' | relative_url }}"></script>
         {%- if site.google_analytics.tracking_id %}
-        {% include google_analytics.html %}
+            {% include google_analytics.html %}
         {%- endif %}
     </body>
 

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

@@ -125,6 +125,12 @@ a[href ^='https://']:not([href *='{{ site.url }}']):after {
 }
 
 .documentation {
+    > div {
+        &.row {
+            margin-right: 0;   
+        }
+    }
+
     .doc-container {
         max-width: 100%;
     }

data/lib/gem_version.rb

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

data/lib/sidebar_html_builder.rb

@@ -100,9 +100,9 @@ module SwedbankPay
       return leaf_markup(page.path, main_title, page.level) unless page.headers?
 
       # If there's no children, only return the headers as leaf node items.
-      return page.headers.map { |h| header_markup(page, h) }.join('') unless page.children?
+      return page.headers.map { |h| header_markup(page, h) }.join unless page.children?
 
-      headers_markup = page.headers.map { |h| header_markup(page, h) }.join('')
+      headers_markup = page.headers.map { |h| header_markup(page, h) }.join
       headers_markup = "<ul class=\"nav-ul\">#{headers_markup}</ul>"
 
       item_markup(page, current_page, headers_markup, true)

data/lib/sidebar_page.rb

@@ -30,6 +30,7 @@ module SwedbankPay
       @title = SidebarPageTitle.parse(jekyll_page, self)
       @order = menu_order(jekyll_page)
       @children = SidebarPageCollection.new(self)
+      @card_overview = jekyll_page['card_overview'].nil? ? false : jekyll_page['card_overview']
     end
 
     def active?(current, is_leaf: false)
@@ -113,6 +114,7 @@ module SwedbankPay
 
       @jekyll_page.data['lead_title'] = @title.lead
       @jekyll_page.data['main_title'] = @title.main
+      @jekyll_page.data['children'] = @children
     end
 
     def save
@@ -144,6 +146,14 @@ module SwedbankPay
       @doc
     end
 
+    def to_liquid
+      @jekyll_page.to_liquid
+    end
+
+    def card_overview?
+      @card_overview
+    end
+
     private
 
     def menu_order(jekyll_page)

data/lib/sidebar_page_collection.rb

@@ -32,5 +32,9 @@ module SwedbankPay
 
       count
     end
+
+    def to_liquid
+      @pages
+    end
   end
 end

data/lib/sidebar_parser.rb

@@ -59,16 +59,19 @@ module SwedbankPay
     def find_headers(page)
       headers = []
 
+      # Don't include headers in the sidebar if we're on a card overview page.
+      return headers if page.card_overview?
+
       page.doc.xpath('//h2').each do |header|
-        next unless header['id']
+        id = header['id']
+
+        next unless id
 
         child_markup = header.last_element_child
-        header = {
-          id: header['id'],
-          title: header.content.strip,
-          hash: (child_markup['href']).to_s
-        }
-        headers.push(header)
+        hash = child_markup['href'].to_s if child_markup.respond_to? :[]
+        title = header.content.strip
+
+        headers.push({ id: id, title: title, hash: hash })
       end
 
       headers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swedbank-pay-design-guide-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.10.0
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jekyll-github-metadata
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll-material-icon-tag
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +203,9 @@ files:
 - _includes/apple-touch-startup-images.md
 - _includes/card-horizontal-list.html
 - _includes/card-list.html
+- _includes/card-overview.html
 - _includes/card.html
+- _includes/doc-container.html
 - _includes/github.html
 - _includes/google_analytics.html
 - _includes/img/merchants/logo-coop.svg