npm - @nationalarchives/frontend - Versions diffs - 0.1.8-prerelease → 0.1.9-prerelease - Mend

@nationalarchives/frontend 0.1.8-prerelease → 0.1.9-prerelease

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (69) hide show

package/nationalarchives/templates/homepage.njk CHANGED Viewed

@@ -1,63 +1,63 @@
-{% from "nationalarchives/components/card/macro.njk" import tnaCard %}
+{% from "../components/card/macro.njk" import tnaCard %}
-{% extends "nationalarchives/templates/layouts/_generic.njk" %}
+{% extends "./layouts/_prototype-kit.njk" %}
 {% block pageTitle %}The National Archives | Welcome{% endblock %}
 {% block content %}
 <div class="tna-container">
   <div class="tna-column tna-column--full">
-    <h1 class="tna-heading tna-heading--xl">
-      Welcome
-    </h1>
+  <h1 class="tna-heading tna-heading--xl">
+    Welcome
+  </h1>
   </div>
   <div class="tna-column tna-column--full">
-    {{ tnaCard({
-      "heading": {
-        "supertitle": "Card supertitle",
-        "title": "Card title",
-        "level": 2,
-        "size": "m"
-      },
+  {{ tnaCard({
+    "heading": {
+    "supertitle": "Card supertitle",
+    "title": "Card title",
+    "level": 2,
+    "size": "m"
+    },
+    "href": "#",
+    "image": {
+    "src": "https://loremflickr.com/640/360",
+    "alt": "A placeholder image"
+    },
+    "body": "<p>Card body</p>",
+    "actions": [
+    {
+      "text": "Card action",
       "href": "#",
-      "image": {
-        "src": "https://loremflickr.com/640/360",
-        "alt": "A placeholder image"
-      },
-      "body": "<p>Card body</p>",
-      "actions": [
-        {
-          "text": "Card action",
-          "href": "#",
-          "title": "Go and do the action"
-        }
-      ],
-      "featured": true,
-      "htmlElement": "article"
-    }) }}
+      "title": "Go and do the action"
+    }
+    ],
+    "featured": true,
+    "htmlElement": "article"
+  }) }}
   </div>
   {% for item in range(0, 6) -%}
   <div class="tna-column tna-column--width-1-3 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny">
-    {{ tnaCard({
-      "heading": {
-        "supertitle": "Card supertitle",
-        "title": "Card title",
-        "level": 3
-      },
+  {{ tnaCard({
+    "heading": {
+    "supertitle": "Card supertitle",
+    "title": "Card title",
+    "level": 3
+    },
+    "href": "#",
+    "image": {
+    "src": "https://loremflickr.com/640/360",
+    "alt": "A placeholder image"
+    },
+    "body": "<p>Card body</p>",
+    "actions": [
+    {
+      "text": "Card action",
       "href": "#",
-      "image": {
-        "src": "https://loremflickr.com/640/360",
-        "alt": "A placeholder image"
-      },
-      "body": "<p>Card body</p>",
-      "actions": [
-        {
-          "text": "Card action",
-          "href": "#",
-          "title": "Go and do the action"
-        }
-      ]
-    }) }}
+      "title": "Go and do the action"
+    }
+    ]
+  }) }}
   </div>
   {%- endfor %}
 </div>

package/nationalarchives/templates/layouts/_generic.njk CHANGED Viewed

@@ -1,60 +1,57 @@
 {# Based on https://github.com/alphagov/govuk-frontend/blob/8b6bf304b9fc891f64459c25a08f3d623f3fea72/packages/govuk-frontend/src/govuk/template.njk #}
 {#% from "./components/skip-link/macro.njk" import tnaSkipLink -%#}
 <!DOCTYPE html>
-<html lang="{{ htmlLang | default('en') }}" class="tna-template {{ htmlClasses }}">
+<html lang="{{ htmlLang | default('en') }}" class="tna-template js-disabled {{ htmlClasses }}">
   <head>
-    <meta charset="utf-8">
-    <title{% if pageTitleLang %} lang="{{ pageTitleLang }}"{% endif %}>{% block pageTitle %}The National Archives{% endblock %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-    <meta name="theme-color" content="{{ themeColor | default('#000000') }}">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    {% block headIcons %}
-      <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ assetPath | default('/assets') }}/images/favicon.ico" type="image/x-icon">
-      <link rel="mask-icon" href="{{ assetPath | default('/assets') }}/images/govuk-mask-icon.svg" color="{{ themeColor | default('#0b0c0c') }}"> {# Hardcoded value of $govuk-black #}
-      <link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon-180x180.png">
-      <link rel="apple-touch-icon" sizes="167x167" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon-167x167.png">
-      <link rel="apple-touch-icon" sizes="152x152" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon-152x152.png">
-      <link rel="apple-touch-icon" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon.png">
-    {% endblock %}
-    {% block head %}{% endblock %}
-    {% block stylesheets %}
-        {% include "govuk-prototype-kit/includes/stylesheets-plugins.njk" %}
-    {% endblock %}
-    {# OpenGraph images needs to be absolute, so we need either a URL for the image or for assetUrl to be set #}
-    {% if opengraphImageUrl or assetUrl %}
-    <meta property="og:image" content="{{ opengraphImageUrl | default(assetUrl + '/images/govuk-opengraph-image.png') }}">
-    {% endif %}
+  <meta charset="utf-8">
+  <title{% if pageTitleLang %} lang="{{ pageTitleLang }}"{% endif %}>{% block pageTitle %}The National Archives{% endblock %}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+  <meta name="theme-color" content="{{ themeColor | default('#000000') }}">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  {% block headIcons %}
+  <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ assetPath | default('/assets') }}/images/favicon.ico" type="image/x-icon">
+  <link rel="mask-icon" href="{{ assetPath | default('/assets') }}/images/govuk-mask-icon.svg" color="{{ themeColor | default('#0b0c0c') }}"> {# Hardcoded value of $govuk-black #}
+  <link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon-180x180.png">
+  <link rel="apple-touch-icon" sizes="167x167" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon-167x167.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon-152x152.png">
+  <link rel="apple-touch-icon" href="{{ assetPath | default('/assets') }}/images/govuk-apple-touch-icon.png">
+  {% endblock %}
+  {% block head %}{% endblock %}
+  {% block stylesheets %}{% endblock %}
+  {# OpenGraph images needs to be absolute, so we need either a URL for the image or for assetUrl to be set #}
+  {% if opengraphImageUrl or assetUrl %}
+  <meta property="og:image" content="{{ opengraphImageUrl | default(assetUrl + '/images/govuk-opengraph-image.png') }}">
+  {% endif %}
   </head>
   <body class="tna-template__body {{ bodyClasses }}" {%- for attribute, value in bodyAttributes %} {{attribute}}="{{value}}"{% endfor %}>
-    {% block bodyStart %}{% endblock %}
-    {% block skipLink %}
-      {#{ govukSkipLink({
-        href: '#main-content',
-        text: 'Skip to main content'
-      }) }#}
-    {% endblock %}
-    {% block header %}
-      <h1>HEADER</h1>
-    {% endblock %}
-    {% block main %}
-        {% block beforeContent %}{% endblock %}
-        <main class="tna-main-wrapper {{ mainClasses }}" id="main-content" role="main"{% if mainLang %} lang="{{ mainLang }}"{% endif %}>
-          {% block content %}{% endblock %}
-        </main>
-    {% endblock %}
-    {% block footer %}
-      <h1>FOOTER</h1>
-    {% endblock %}
-    {% block bodyEnd %}{% endblock %}
+  {% block bodyStart %}{% endblock %}
+  {% block skipLink %}
+  {#{ govukSkipLink({
+    href: '#main-content',
+    text: 'Skip to main content'
+  }) }#}
+  {% endblock %}
+  {% block header %}
+  <h1>HEADER</h1>
+  {% endblock %}
+  {% block main %}
+  {% block beforeContent %}{% endblock %}
+  <main class="tna-main-wrapper {{ mainClasses }}" id="main-content" role="main"{% if mainLang %} lang="{{ mainLang }}"{% endif %}>
+    {% block content %}{% endblock %}
+  </main>
+  {% endblock %}
+  {% block footer %}
+  <h1>FOOTER</h1>
+  {% endblock %}
+  {% block bodyEnd %}{% endblock %}
   </body>
 </html>

package/nationalarchives/templates/layouts/_prototype-kit.njk ADDED Viewed

@@ -0,0 +1,5 @@
+{% extends "./_generic.njk" %}
+{% block stylesheets %}
+{% include "govuk-prototype-kit/includes/stylesheets-plugins.njk" %}
+{% endblock %}

package/nationalarchives/templates/search-results.njk CHANGED Viewed

@@ -1,38 +1,38 @@
-{% from "nationalarchives/components/card/macro.njk" import tnaCard %}
+{% from "../components/card/macro.njk" import tnaCard %}
-{% extends "nationalarchives/templates/layouts/_generic.njk" %}
+{% extends "./layouts/_prototype-kit.njk" %}
 {% block pageTitle %}The National Archives | Results{% endblock %}
 {% block main %}
-    <div class="tna-container">
-        <div class="tna-column tna-column--1-4 tna-column--width-1-3-medium tna-column--full-small tna-column--full-tiny">
-            <h2>Search filters...</h2>
-        </div>
-        <main class="tna-main-wrapper tna-column tna-column--container tna-column--3-4 tna-column--width-2-3-medium tna-column--full-small tna-column--full-tiny {{ mainClasses }}" id="main-content" role="main"{% if mainLang %} lang="{{ mainLang }}"{% endif %}>
-            {% block beforeContent %}{% endblock %}
-            <div class="tna-column tna-column--full">
-                <h1 class="tna-heading tna-heading--xl">
-                    Search results for "foobar"
-                </h1>
-            </div>
-            {% for item in range(0, 6) -%}
-                <div class="tna-column tna-column--width-1-2 tna-column--width-full-small tna-column--width-full-tiny">
-                    {{ tnaCard({
-                        "heading": {
-                            "supertitle": "Card supertitle",
-                            "title": "Card title",
-                            "level": 2
-                        },
-                        "href": "#",
-                        "image": {
-                            "src": "https://loremflickr.com/640/360",
-                            "alt": "A placeholder image"
-                        },
-                        "body": "<p>Card body</p>",
-                    }) }}
-                </div>
-            {%- endfor %}
-        </main>
+  <div class="tna-container">
+    <div class="tna-column tna-column--1-4 tna-column--width-1-3-medium tna-column--full-small tna-column--full-tiny">
+      <h2>Search filters...</h2>
     </div>
+    <main class="tna-main-wrapper tna-column tna-column--container tna-column--3-4 tna-column--width-2-3-medium tna-column--full-small tna-column--full-tiny {{ mainClasses }}" id="main-content" role="main"{% if mainLang %} lang="{{ mainLang }}"{% endif %}>
+      {% block beforeContent %}{% endblock %}
+      <div class="tna-column tna-column--full">
+        <h1 class="tna-heading tna-heading--xl">
+          Search results for "foobar"
+        </h1>
+      </div>
+      {% for item in range(0, 6) -%}
+        <div class="tna-column tna-column--width-1-2 tna-column--width-full-small tna-column--width-full-tiny">
+          {{ tnaCard({
+            "heading": {
+              "supertitle": "Card supertitle",
+              "title": "Card title",
+              "level": 2
+            },
+            "href": "#",
+            "image": {
+              "src": "https://loremflickr.com/640/360",
+              "alt": "A placeholder image"
+            },
+            "body": "<p>Card body</p>",
+          }) }}
+        </div>
+      {%- endfor %}
+    </main>
+  </div>
 {% endblock %}

package/nationalarchives/templates/topics.njk CHANGED Viewed

@@ -1,42 +1,42 @@
-{% from "nationalarchives/components/card/macro.njk" import tnaCard %}
-{% from "nationalarchives/components/hero/macro.njk" import tnaHero %}
+{% from "../components/card/macro.njk" import tnaCard %}
+{% from "../components/hero/macro.njk" import tnaHero %}
-{% extends "nationalarchives/templates/layouts/_generic.njk" %}
+{% extends "./layouts/_prototype-kit.njk" %}
 {% block pageTitle %}The National Archives | Topics{% endblock %}
 {% block main %}
 <main class="tna-main-wrapper">
-    {{ tnaHero({
-        "heading": "Title",
-        "body": "<p>Body</p>",
-        "image": {
-            "src": "https://picsum.photos/id/29/640/360",
-            "alt": "A placeholder image",
-            "information": "Photo of some mountains by a famous photographer, ©2012"
-        }
-    }) }}
-    <div class="tna-container">
-        <div class="tna-column tna-column--full">
-            <h2>Topic title</h2>
-        </div>
-        {% for item in range(0, 6) -%}
-            <div class="tna-column tna-column--width-1-3 tna-column--width-1-2-medium tna-column--width-full-small tna-column--width-full-tiny">
-                {{ tnaCard({
-                    "heading": {
-                        "supertitle": "Card supertitle",
-                        "title": "Card title",
-                        "level": 3
-                    },
-                    "href": "#",
-                    "image": {
-                        "src": "https://loremflickr.com/640/360",
-                        "alt": "A placeholder image"
-                    },
-                    "body": "<p>Card body</p>",
-                }) }}
-            </div>
-        {%- endfor %}
+  {{ tnaHero({
+    "heading": "Title",
+    "body": "<p>Body</p>",
+    "image": {
+      "src": "https://picsum.photos/id/29/640/360",
+      "alt": "A placeholder image",
+      "information": "Photo of some mountains by a famous photographer, ©2012"
+    }
+  }) }}
+  <div class="tna-container">
+    <div class="tna-column tna-column--full">
+      <h2>Topic title</h2>
     </div>
+    {% for item in range(0, 6) -%}
+      <div class="tna-column tna-column--width-1-3 tna-column--width-1-2-medium tna-column--width-full-small tna-column--width-full-tiny">
+        {{ tnaCard({
+          "heading": {
+            "supertitle": "Card supertitle",
+            "title": "Card title",
+            "level": 3
+          },
+          "href": "#",
+          "image": {
+            "src": "https://loremflickr.com/640/360",
+            "alt": "A placeholder image"
+          },
+          "body": "<p>Card body</p>",
+        }) }}
+      </div>
+    {%- endfor %}
+  </div>
 </main>
 {% endblock %}

package/nationalarchives/tools/_grid.scss CHANGED Viewed

@@ -2,43 +2,68 @@
 @use "../variables/grid";
 @mixin columns-generator($count, $suffix: "") {
-  @for $i from 1 through $count - 1 {
-    $simplest-fraction-found: false;
-    @for $j from math.div($count, 2) through 1 {
-      @if (
-        $count % $j == 0 and $i % $j == 0 and $simplest-fraction-found != true
-      ) {
-        .tna-column--width-#{math.div($i, $j)}-#{math.div($count, $j)}#{$suffix} {
+  @if $suffix != "" {
+    $suffix: "-" + $suffix;
+  }
+  .tna-column {
+    &--full#{$suffix} {
+      width: 100%;
+      flex: none;
+    }
+    @for $i from 1 through $count - 1 {
+      $simplest-fraction-found: false;
+      @for $j from math.div($count, 2) through 1 {
+        @if (
+          $count % $j == 0 and $i % $j == 0 and $simplest-fraction-found != true
+        ) {
+          &--width-#{math.div($i, $j)}-#{math.div($count, $j)}#{$suffix} {
+            width: math.div(100%, $count) * $i;
+            flex: none;
+          }
+          // .column--margin-right-#{math.div($i, $j)}-#{math.div($count, $j)}#{$suffix} {
+          //   margin-right: math.div(100%, $count) * $i;
+          // }
+          // .column--margin-left-#{math.div($i, $j)}-#{math.div($count, $j)}#{$suffix} {
+          //   margin-left: math.div(100%, $count) * $i;
+          // }
+          $simplest-fraction-found: true;
+        }
+      }
+      @if $simplest-fraction-found != true {
+        &--width-#{$i}-#{$count}#{$suffix} {
           width: math.div(100%, $count) * $i;
           flex: none;
         }
-        // .column--margin-right-#{math.div($i, $j)}-#{math.div($count, $j)}#{$suffix} {
-        //   margin-right: math.div(100%, $count) * $i;
-        // }
-        // .column--margin-left-#{math.div($i, $j)}-#{math.div($count, $j)}#{$suffix} {
-        //   margin-left: math.div(100%, $count) * $i;
-        // }
+        //   .column--margin-right-#{$i}-#{$count}#{$suffix} {
+        //     margin-right: math.div(100%, $count) * $i;
+        //   }
-        $simplest-fraction-found: true;
+        //   .column--margin-left-#{$i}-#{$count}#{$suffix} {
+        //     margin-left: math.div(100%, $count) * $i;
+        //   }
       }
     }
-    @if $simplest-fraction-found != true {
-      .tna-column--width-#{$i}-#{$count}#{$suffix} {
-        width: math.div(100%, $count) * $i;
-        flex: none;
-      }
+    @for $i from 1 through 2 {
+      &--flex-#{$i}#{$suffix} {
+        width: auto;
-      //   .column--margin-right-#{$i}-#{$count}#{$suffix} {
-      //     margin-right: math.div(100%, $count) * $i;
-      //   }
+        flex: $i 0;
+      }
+    }
-      //   .column--margin-left-#{$i}-#{$count}#{$suffix} {
-      //     margin-left: math.div(100%, $count) * $i;
-      //   }
+    @for $i from 1 through 3 {
+      &--order-#{$i}#{$suffix} {
+        order: $i;
+      }
     }
   }
 }

package/nationalarchives/utilities/_global.scss CHANGED Viewed

@@ -1,3 +1,4 @@
+@use "../variables/colour";
 @use "../variables/typography";
 .tna-template {
@@ -9,7 +10,7 @@
   overflow-y: auto;
   -webkit-overflow-scrolling: touch;
-  font-size: typography.$base-font-size-px;
+  font-size: #{typography.$base-font-size-px}px;
   @media (prefers-reduced-motion) {
     * {
@@ -20,6 +21,7 @@
 }
 .tna-template__body {
+  min-height: 100%;
   margin: 0;
   padding: 0;
@@ -42,6 +44,11 @@ canvas {
   width: 100%;
 }
+[hidden] {
+  display: none;
+}
 *:focus {
-  outline: 3px #f0a solid;
+  outline: 0.3125rem colour.$focus-colour solid;
+  outline-offset: 0.125rem;
 }

package/nationalarchives/utilities/_typography.scss CHANGED Viewed

@@ -1,3 +1,4 @@
+@use "../variables/colour";
 @use "../variables/typography";
 @use "../tools/media";
 @use "../tools/typography" as tools;
@@ -9,6 +10,7 @@
 .tna-template {
   font-family: typography.$font-family-main;
   font-weight: typography.$font-weight-main;
+  color: colour.$base-font-colour;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
@@ -59,6 +61,7 @@
     margin-top: 0;
     margin-bottom: 1.5rem;
+    color: colour.$tna-black;
     font-family: typography.$font-family-heading;
     font-weight: typography.$font-weight-heading;
@@ -113,6 +116,7 @@
     &__supertitle {
       margin: 0;
+      color: colour.$base-font-colour;
       @include tools.relative-font-size(14);
       font-family: typography.$font-family-detail;
       font-weight: typography.$font-weight-detail;
@@ -126,8 +130,12 @@
     &__title {
       margin: 0;
+      color: colour.$tna-black;
       .tna-hgroup__supertitle {
         display: block;
+        color: colour.$base-font-colour;
       }
     }

package/nationalarchives/variables/_colour.scss CHANGED Viewed

@@ -1 +1,11 @@
-$base-font-colour: #111 !default;
+$tna-black: #000;
+$tna-yellow: #fc0;
+$tna-pink: #fe1d57;
+$tna-orange: #fd3f03;
+$tna-green: #86bc25;
+$tna-blue: #00b0ff;
+$dark: #26262a !default;
+$base-font-colour: #343338 !default;
+$focus-colour: #004c7e !default;
+$keyline-colour: #ccc !default;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nationalarchives/frontend",
-  "version": "0.1.8-prerelease",
+  "version": "0.1.9-prerelease",
   "description": "The National Archives frontend styles",
   "scripts": {
     "start": "storybook dev -p 6006",
@@ -61,7 +61,7 @@
     "glob": "^10.2.7",
     "jest-image-snapshot": "^6.1.0",
     "nunjucks": "^3.2.3",
-    "prettier": "^2.7.1",
+    "prettier": "^3.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sass": "^1.54.9",
@@ -70,8 +70,8 @@
     "storybook": "^7.0.22",
     "style-loader": "^3.3.1",
     "stylelint": "^15.9.0",
-    "stylelint-config-standard-scss": "^9.0.0",
-    "stylelint-selector-bem-pattern": "^2.1.1",
+    "stylelint-config-standard-scss": "^10.0.0",
+    "stylelint-selector-bem-pattern": "^3.0.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^5.1.4"
   }

package/nationalarchives/assets/images/tna-square-logo-inverted.svg DELETED Viewed

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 160 160" style="enable-background:new 0 0 160 160;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#000;}
-    .st1{fill:#fff;}
-</style>
-<rect class="st0" width="160" height="160"/>
-<path class="st1" d="M1.9,107.2h156.3V158H1.9V107.2z M1.9,54.5h79.1h77.2v50.8H1.9V54.5z M1.9,1.9h77.2v50.8H1.9V1.9z M80.9,1.9
-    h77.2v50.8H80.9C80.9,52.7,80.9,1.9,80.9,1.9z M80.9,0H0v52.7v1.9v50.8v1.9v52.7h160v-52.7v-1.9V52.7V0H80.9z"/>
-<polygon class="st1" points="21.3,19.5 15.9,19.5 15.9,16.5 30.2,16.5 30.2,19.5 24.8,19.5 24.8,37.9 21.3,37.9 "/>
-<polygon class="st1" points="31.6,16.5 35,16.5 35,25.5 43.4,25.5 43.4,16.5 46.8,16.5 46.8,37.9 43.4,37.9 43.4,28.6 35,28.6
-    35,37.9 31.6,37.9 "/>
-<polygon class="st1" points="50.9,16.5 63.1,16.5 63.1,19.5 54.3,19.5 54.3,25.6 61.7,25.6 61.7,28.6 54.3,28.6 54.3,34.9
-    63.1,34.9 63.1,37.9 50.9,37.9 "/>
-<path class="st1" d="M19.7,69.2h3.8l6.4,12.5c0.6,1.1,1.1,2.7,1.6,4h0.2c-0.2-1.7-0.3-3.6-0.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3
-    c-0.7-1.4-1.2-2.7-1.7-4.2h-0.2c0.2,1.4,0.3,3.3,0.3,5v11.5h-3.5C19.7,90.6,19.7,69.2,19.7,69.2z"/>
-<path class="st1" d="M47.8,82.6l-1.7-6.3c-0.3-1.1-0.6-2.2-0.9-3.8H45c-0.3,1.6-0.5,2.6-0.8,3.8l-1.7,6.3H47.8z M43,69.2h4.2
-    l6.2,21.4h-3.5l-1.5-5.2h-6.6l-1.4,5.2h-3.6L43,69.2z"/>
-<polygon class="st1" points="57.2,72.3 51.8,72.3 51.8,69.2 66,69.2 66,72.3 60.6,72.3 60.6,90.7 57.2,90.7 "/>
-<rect x="67.8" y="69.2" class="st1" width="3.5" height="21.4"/>
-<path class="st1" d="M87.5,80c0-5.3-1.7-8-4.8-8c-3.2,0-4.8,2.7-4.8,8c0,5.2,1.6,7.9,4.8,7.9C85.9,87.9,87.5,85.2,87.5,80 M74.2,80
-    c0-7,3-11.1,8.5-11.1c5.4,0,8.4,4.1,8.4,11.1c0,6.9-3,11-8.4,11C77.3,91,74.2,86.9,74.2,80"/>
-<path class="st1" d="M94.3,69.2H98l6.4,12.5c0.6,1.1,1.2,2.7,1.7,4h0.2c-0.2-1.7-0.3-3.6-0.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3
-    c-0.7-1.4-1.2-2.7-1.7-4.2h-0.2c0.2,1.4,0.3,3.3,0.3,5v11.5h-3.5V69.2z"/>
-<path class="st1" d="M122.4,82.6l-1.7-6.3c-0.3-1.1-0.6-2.2-0.9-3.8h-0.2c-0.3,1.6-0.5,2.6-0.8,3.8l-1.7,6.3H122.4z M117.6,69.2h4.2
-    l6.2,21.4h-3.5l-1.5-5.2h-6.6l-1.4,5.2h-3.6L117.6,69.2z"/>
-<polygon class="st1" points="129.9,69.2 133.4,69.2 133.4,87.6 141.8,87.6 141.8,90.7 129.9,90.7 "/>
-<path class="st1" d="M26.9,135.2l-1.7-6.3c-0.3-1.1-0.6-2.2-0.9-3.8h-0.2c-0.3,1.6-0.5,2.6-0.8,3.8l-1.7,6.3H26.9z M22.1,121.8h4.2
-    l6.2,21.4H29l-1.5-5.2h-6.6l-1.4,5.2h-3.6L22.1,121.8z"/>
-<path class="st1" d="M39.9,132.5c2.5,0,3.4-1.6,3.4-3.9c0-2.2-1-3.8-3.4-3.8h-2.7v7.7H39.9z M33.8,121.8h6.4c4.5,0,6.7,2.4,6.7,6.6
-    c0,3.1-1.5,5.6-3.7,6.3v0.2c1,1.1,4,7.5,4.8,7.9v0.5h-3.8c-1-0.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5L33.8,121.8L33.8,121.8z"/>
-<path class="st1" d="M52.9,132.5c0,5.3,1.9,8,4.8,8c2.9,0,4-2,4-5.2l3.5,0.1c0,0.2,0.1,0.4,0.1,0.6c0,4.4-2.1,7.5-7.5,7.5
-    c-5.2,0-8.5-3.9-8.5-11.1c0-7.1,3.3-11,8.5-11c6.4,0,7.5,4.6,7.5,7.2c0,0.3,0,0.7-0.1,0.9l-3.5,0.1c0-3.3-1.2-5.2-4-5.2
-    C54.8,124.6,52.9,127.3,52.9,132.5"/>
-<polygon class="st1" points="68,121.8 71.5,121.8 71.5,130.9 79.8,130.9 79.8,121.8 83.3,121.8 83.3,143.3 79.8,143.3 79.8,133.9
-    71.5,133.9 71.5,143.3 68,143.3 "/>
-<rect x="87.9" y="121.8" class="st1" width="3.5" height="21.4"/>
-<path class="st1" d="M94.2,121.8h3.6l3.2,12.3c0.5,1.9,0.8,3.6,1.1,5.6h0.2c0.3-2,0.6-3.7,1.1-5.6l3.2-12.3h3.6l-6.1,21.4h-4.1
-    L94.2,121.8z"/>
-<polygon class="st1" points="112.7,121.8 125,121.8 125,124.9 116.2,124.9 116.2,130.9 123.6,130.9 123.6,133.9 116.2,133.9
-    116.2,140.2 125,140.2 125,143.3 112.7,143.3 "/>
-<path class="st1" d="M130.4,136c0,0.2-0.1,0.5-0.1,0.8c0,1.9,0.8,3.7,3.4,3.7c2.1,0,3.3-1.2,3.3-2.9c0-1.6-0.7-2.4-2.2-3l-3.4-1.3
-    c-2.4-0.9-4.2-2.4-4.2-5.7c0-3.5,2.3-6.1,6.6-6.1c5.5,0,6.4,3.6,6.4,5.9c0,0.3,0,0.7-0.1,1.1l-3.4,0.1c0-0.2,0.1-0.5,0.1-0.7
-    c0-1.7-0.6-3.2-3-3.2c-2.1,0-3,1.2-3,2.8c0,1.7,0.9,2.5,2.2,2.9l3.5,1.3c2.6,1,4.3,2.6,4.3,5.8c0,3.6-2.4,6.1-7,6.1
-    c-5.9,0-6.8-3.9-6.8-6.5c0-0.3,0-0.6,0.1-1L130.4,136z"/>
-</svg>