Merge branch 'master' into DX-1462_make_search_icon_clickable

SwedbankPay · Jan 26, 2021 · 98fd0be · 98fd0be
2 parents d179810 + b08672e
commit 98fd0be
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -27,12 +27,12 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
-    codecov (0.2.15)
-      simplecov (>= 0.15, < 0.21)
+    codecov (0.4.0)
+      simplecov (>= 0.15, < 0.22)
     colorator (1.1.0)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.3.5)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)

diff --git a/_config.yml b/_config.yml
@@ -30,7 +30,7 @@ opengraph:
   image: /image1.png
 design_guide:
   base_url: https://design.swedbankpay.com
-  version: 4.8.1
+  version: 5.0.1
 search:
   enabled: true
   url: /search

diff --git a/_includes/github.html b/_includes/github.html
@@ -3,7 +3,7 @@
 <a href="{{ site.github.repository_url }}/tree/{{ github_branch }}/{{ page.path }}"
     class="github" target="_blank"
     rel="noopener noreferrer" title="Edit '{{ page.title }}' on GitHub">
-    <svg aria-labelledby="simpleicons-github-icon" role="img" width="50" viewBox="0 0 24 24"
+    <svg aria-labelledby="simpleicons-github-icon" role="img" width="40" viewBox="0 0 24 24"
         xmlns="http://www.w3.org/2000/svg">
         <title id="simpleicons-github-icon">Edit "{{ page.title }}" on GitHub</title>
         <path fill="#fff" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />

diff --git a/_includes/iterator.html b/_includes/iterator.html
@@ -5,13 +5,13 @@
 
 <nav class="iterator d-flex">
     {% if prev_href != blank and prev_href != empty and prev_href != nil %}
-    <a class="mr-auto btn btn-primary" role="button" rel="prev" href="{{ prev_href }}">
+    <a class="mr-auto btn btn-secondary" role="button" rel="prev" href="{{ prev_href }}">
         {{ prev_title }}
     </a>
     {% endif %}
 
     {% if next_href != blank and next_href != empty and next_href != nil %}
-    <a class="ml-auto btn btn-primary" role="button" rel="next" href="{{ next_href }}">
+    <a class="ml-auto btn btn-secondary" role="button" rel="next" href="{{ next_href }}">
         {{ next_title }}
     </a>
     {% endif %}

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -12,7 +12,7 @@
 {%- assign description = page.opengraph.description | default: site.opengraph.description -%}
 {%- assign image = page.opengraph.image | default: site.opengraph.image -%}
 {%- assign design_guide_base_url = site.design_guide.base_url | default: 'https://design.swedbankpay.com' -%}
-{%- assign design_guide_version = site.design_guide.version | default: '4.8.1' -%}
+{%- assign design_guide_version = site.design_guide.version | default: '5.0.1' -%}
 {%- assign design_guide_url = design_guide_base_url | append: '/v/' | append: design_guide_version -%}
 <!DOCTYPE html>
 <html lang="{{ site.lang | default: "en-US" }}">

diff --git a/_sass/title-header.scss b/_sass/title-header.scss
@@ -34,6 +34,10 @@
         }
         a {
             color: #43d0dd;
+
+            ::after {
+                content: url(../img/external-url-dark-bg.svg);
+            }
         }
     }
 

diff --git a/assets/img/external-url-dark-bg.svg b/assets/img/external-url-dark-bg.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,10 @@ @@
             }
             a {
                 color: #43d0dd;
+                ::after {
+                    content: url(../img/external-url-dark-bg.svg);
+                }
             }
         }
@@ Expand Down @@