@comicrelief/storybook 1.34.2 → 2.0.1

package/coverage/clover.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1679501847497" clover="3.2.0">
-  <project timestamp="1679501847497" name="All files">
+<coverage generated="1689167533328" clover="3.2.0">
+  <project timestamp="1689167533328" name="All files">
     <metrics statements="136" coveredstatements="71" conditionals="110" coveredconditionals="57" methods="45" coveredmethods="15" elements="291" coveredelements="143" complexity="0" loc="136" ncloc="136" packages="5" files="8" classes="8">
       <package name="src.components.FileUp">
         <metrics statements="30" coveredstatements="6" conditionals="22" coveredconditionals="4" methods="8" coveredmethods="3"/>

package/coverage/lcov-report/index.html

@@ -109,7 +109,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="prettify.js"></script>

package/coverage/lcov-report/src/components/FileUp/FileUp.js.html

@@ -527,7 +527,7 @@ export default FileUp;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../../prettify.js"></script>

package/coverage/lcov-report/src/components/FileUp/index.html

@@ -57,7 +57,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../../prettify.js"></script>

package/coverage/lcov-report/src/components/FileUp/src/service/S3FileUploadService.js.html

@@ -161,7 +161,7 @@ export default S3FileUploadService;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../../../../prettify.js"></script>

package/coverage/lcov-report/src/components/FileUp/src/service/index.html

@@ -57,7 +57,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../../../../prettify.js"></script>

package/coverage/lcov-report/src/components/SchoolsLookUp/SchoolsLookUp.js.html

@@ -1757,7 +1757,7 @@ export default SchoolsLookUp;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../../prettify.js"></script>

package/coverage/lcov-report/src/components/SchoolsLookUp/index.html

@@ -57,7 +57,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../../prettify.js"></script>

package/coverage/lcov-report/src/utils/index.html

@@ -57,7 +57,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/coverage/lcov-report/src/utils/newid.js.html

@@ -47,7 +47,7 @@ export default function (prefix = <span class="branch-0 cbranch-no" title="branc
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/coverage/lcov-report/tests/mocks/enzyme.js.html

@@ -53,7 +53,7 @@ global.mount = mount;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/coverage/lcov-report/tests/mocks/fileMock.js.html

@@ -32,7 +32,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/coverage/lcov-report/tests/mocks/index.html

@@ -96,7 +96,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/coverage/lcov-report/tests/mocks/shim.js.html

@@ -38,7 +38,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/coverage/lcov-report/tests/mocks/styleMock.js.html

@@ -32,7 +32,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Mar 22 2023 16:17:27 GMT+0000 (Greenwich Mean Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Jul 12 2023 14:12:13 GMT+0100 (British Summer Time)
 </div>
 </div>
 <script src="../../prettify.js"></script>

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@comicrelief/storybook",
   "description": "React components to build the Comic Relief front-end experience",
-  "version": "1.34.2",
+  "version": "2.0.1",
   "dependencies": {
-    "@comicrelief/pattern-lab": "7.67.1",
     "@snyk/protect": "^1.1060.0",
     "@storybook/addon-info": "3",
     "@storybook/addon-knobs": "3",
@@ -29,6 +28,7 @@
     "react-vis": "^1.9.1",
     "shortid": "^2.2.13",
     "snyk": "^1.996.0",
+    "susy": "^2.2.12",
     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
     "url-join": "2",
     "yup": "^0.32.9",
@@ -85,7 +85,7 @@
     "file-loader": "1.1.11",
     "jest": "21",
     "jest-mock-random": "1",
-    "node-sass": "4",
+    "node-sass": "^6.0.0",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "2",
     "randomcolor": "^0.5.3",
@@ -103,7 +103,8 @@
     "js-yaml": "3.13.1",
     "immer": "9.0.6",
     "plist": "3.0.5",
-    "prismjs": "1.25.0"
+    "prismjs": "1.25.0",
+    "node-gyp": "8.4.1"
   },
   "repository": {
     "type": "git",
@@ -122,5 +123,10 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
+  "overrides": {
+    "prebuild": {
+      "node-gyp": "$node-gyp"
+    }
+  },
   "snyk": true
 }

package/src/components/BrowserSupportMessage/BrowserSupport.scss

@@ -1,16 +1,16 @@
 /* Pattern Lab Base theme variables */
-@import "~@comicrelief/pattern-lab/sass/base/variables/grid";
-@import "~@comicrelief/pattern-lab/sass/base/variables/colours";
-@import "~@comicrelief/pattern-lab/sass/base/core/base-breakpoints";
-@import "~@comicrelief/pattern-lab/sass/base/core/base-1-mixins";
+@import "../../sass/base/variables/grid";
+@import "../../sass/base/variables/colours";
+@import "../../sass/base/core/base-breakpoints";
+@import "../../sass/base/core/base-1-mixins";
 
 /* Pattern Lab Comic Relief theme variables */
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/colours";
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/typography";
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/mixins";
+@import "../../sass/themes/cr/2019/variables/colours";
+@import "../../sass/themes/cr/2019/variables/typography";
+@import "../../sass/themes/cr/2019/variables/mixins";
 /* Pattern Lab Comic Relief theme components */
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/components/typography/fonts";
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/components/typography/typography";
+@import "../../sass/themes/cr/2019/components/typography/fonts";
+@import "../../sass/themes/cr/2019/components/typography/typography";
 
 .browser-message {
   background: $colour-black;

package/src/components/CookieConsentMessage/CookieConsent.scss

@@ -1,24 +1,24 @@
 $image-path: "images/";
 /* Pattern Lab Base theme variables */
-@import "~@comicrelief/pattern-lab/sass/base/variables/grid";
-@import "~@comicrelief/pattern-lab/sass/base/variables/colours";
-@import "~@comicrelief/pattern-lab/sass/base/variables/lists";
-@import "~@comicrelief/pattern-lab/sass/base/core/base-breakpoints";
-@import "~@comicrelief/pattern-lab/sass/base/core/base-1-mixins";
-@import "~@comicrelief/pattern-lab/sass/base/variables/typography";
+@import "../../sass/base/variables/grid";
+@import "../../sass/base/variables/colours";
+@import "../../sass/base/variables/lists";
+@import "../../sass/base/core/base-breakpoints";
+@import "../../sass/base/core/base-1-mixins";
+@import "../../sass/base/variables/typography";
 
 /* Pattern Lab Comic Relief theme variables */
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/colours";
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/typography";
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/mixins";
+@import "../../sass/themes/cr/2019/variables/colours";
+@import "../../sass/themes/cr/2019/variables/typography";
+@import "../../sass/themes/cr/2019/variables/mixins";
 
 /* Pattern Lab Comic Relief theme components */
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/components/typography/fonts";
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/components/typography/typography";
+@import "../../sass/themes/cr/2019/components/typography/fonts";
+@import "../../sass/themes/cr/2019/components/typography/typography";
 
 /* Pattern Lab Base theme components */
-@import "~@comicrelief/pattern-lab/sass/base/components/cookie-consent/_cookie-consent";
-@import "~@comicrelief/pattern-lab/sass/base/components/buttons/_buttons";
+@import "../../sass/base/components/cookie-consent/_cookie-consent";
+@import "../../sass/base/components/buttons/_buttons";
 
 .cookie-consent.cc_container {
   position: relative ! important; // fixed position to relative not fixed

package/src/components/Footer/Footer.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import propTypes from 'prop-types';
-import SvgSprite from '@comicrelief/pattern-lab/sass/base/components/svg/spritesheet.svg';
 import ReactSVG from 'react-svg';
-
+import SvgSprite from '../SVG/spritesheet.svg';
 import Menu from '../Menu/Menu';
 import SocialLink from '../SocialLink/SocialLink';
 

package/src/components/Footer/_story.js

@@ -9,7 +9,7 @@ storiesOf('Footer', module)
   .addDecorator(withKnobs)
   .add('Comic Relief',
     withInfo('comicrelief.com footer')(() => {
-      const copy = text('Copy', 'Comic Relief is the trading name of Charity Projects, a registered charity in England and Wales (326568) and Scotland (SC039730), which is a company limited by guarantee registered in England and Wales (01806414). Registered address: 1st Floor, 89 Albert Embankment London, SE1 7TP.');
+      const copy = text('Copy', 'Comic Relief is the trading name of Charity Projects, a registered charity in England and Wales (326568) and Scotland (SC039730), which is a company limited by guarantee registered in England and Wales (01806414). Registered address: 6th Floor, The White Chapel Building, 10 Whitechapel High Street, London, E1 8QS.');
       const source = 'https://www.comicrelief.com';
       const campaign = 'comicrelief';
       const forceFallback = boolean('forceFallback', false);

package/src/components/Footer/footer.scss

@@ -13,13 +13,13 @@ $screen-md-only: $screen-md $screen-md-max;
 $screen-lg: 1024px;
 $screen-lg-min: $screen-lg;
 
-@import "~@comicrelief/pattern-lab/sass/base/core/_base-breakpoints.scss";
-@import "~@comicrelief/pattern-lab/sass/base/core/_base-1-mixins.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_colours.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_grid.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_theme.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_typography.scss";
+@import "../../sass/base/core/_base-breakpoints.scss";
+@import "../../sass/base/core/_base-1-mixins.scss";
+@import "../../sass/base/variables/_colours.scss";
+@import "../../sass/base/variables/_grid.scss";
+@import "../../sass/base/variables/_theme.scss";
+@import "../../sass/base/variables/_typography.scss";
 
-@import "~@comicrelief/pattern-lab/sass/base/components/footer/_footer.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/navigation/_footer-nav.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/social/_social.scss";
+@import "../../sass/base/components/footer/_footer.scss";
+@import "../../sass/base/components/navigation/_footer-nav.scss";
+@import "../../sass/base/components/social/_social.scss";

package/src/components/Footer/package.json

@@ -6,8 +6,7 @@
   "dependencies": {
     "prop-types": "^15.5.10",
     "react": "^15.6.1",
-    "react-svg": "^2.1.22",
-    "@comicrelief/pattern-lab": "^7.63.0"
+    "react-svg": "^2.1.22"
   },
   "devDependencies": {
     "@storybook/addon-info": "^3.4.8",

package/src/components/GrantsNearYou/GrantsNearYou.scss

@@ -1,12 +1,12 @@
-@import "~@comicrelief/pattern-lab/sass/base/_core.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_colours.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_lists.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_grid.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_typography.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/background-colours/_background-colours.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/typography/_typography.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/single-msg/_single-msg.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/promo-header/_promo-header.scss";
+@import "../../sass/base/_core.scss";
+@import "../../sass/base/variables/_colours.scss";
+@import "../../sass/base/variables/_lists.scss";
+@import "../../sass/base/variables/_grid.scss";
+@import "../../sass/base/variables/_typography.scss";
+@import "../../sass/base/components/background-colours/_background-colours.scss";
+@import "../../sass/base/components/typography/_typography.scss";
+@import "../../sass/base/components/single-msg/_single-msg.scss";
+@import "../../sass/base/components/promo-header/_promo-header.scss";
   
 .funded-projects {
   header {

package/src/components/JustInTime/JustInTime.scss

@@ -1,11 +1,11 @@
-@import "~@comicrelief/pattern-lab/sass/base/core/base-1-mixins";
-@import "~@comicrelief/pattern-lab/sass/base/variables/grid";
-@import "~@comicrelief/pattern-lab/sass/base/variables/colours";
-@import "~@comicrelief/pattern-lab/sass/base/variables/typography";
+@import "../../sass/base/core/base-1-mixins";
+@import "../../sass/base/variables/grid";
+@import "../../sass/base/variables/colours";
+@import "../../sass/base/variables/typography";
 /* Pattern Lab Comic Relief theme variables */
-@import "~@comicrelief/pattern-lab/sass/themes/cr/2019/variables/mixins";
+@import "../../sass/themes/cr/2019/variables/mixins";
 
-@import "~@comicrelief/pattern-lab/sass/base/components/just-in-time-block/_just-in-time";
+@import "../../sass/base/components/just-in-time-block/_just-in-time";
 
 /* override base styles */
 .form__row--just-in-time-block {

package/src/components/RadioButtons/RadioButtons.scss

@@ -1,11 +1,11 @@
 $image-path : '/';
 
-@import "~@comicrelief/pattern-lab/sass/base/_core.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_colours.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_lists.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_grid.scss";
-@import "~@comicrelief/pattern-lab/sass/base/variables/_typography.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/background-colours/_background-colours.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/typography/_typography.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/form/_standard-form.scss";
-@import "~@comicrelief/pattern-lab/sass/base/components/buttons/_buttons.scss";
+@import "../../sass/base/_core.scss";
+@import "../../sass/base/variables/_colours.scss";
+@import "../../sass/base/variables/_lists.scss";
+@import "../../sass/base/variables/_grid.scss";
+@import "../../sass/base/variables/_typography.scss";
+@import "../../sass/base/components/background-colours/_background-colours.scss";
+@import "../../sass/base/components/typography/_typography.scss";
+@import "../../sass/base/components/form/_standard-form.scss";
+@import "../../sass/base/components/buttons/_buttons.scss";

package/src/components/SVG/instagram.svg

@@ -0,0 +1,18 @@
+<svg class="icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 50 50">
+	<defs>
+		<radialGradient id="a" cx="14.53" cy="2.37" r="50.41" gradientTransform="matrix(1, 0, 0, -1, 0, 52.25)" gradientUnits="userSpaceOnUse">
+			<stop offset="0" stop-color="#ffd676"></stop>
+			<stop offset="0.25" stop-color="#f2a454"></stop>
+			<stop offset="0.38" stop-color="#f05c3c"></stop>
+			<stop offset="0.7" stop-color="#c22f86"></stop>
+			<stop offset="0.96" stop-color="#6666ad"></stop>
+			<stop offset="0.99" stop-color="#5c6cb2"></stop>
+		</radialGradient>
+	</defs>
+	<title>Instagram</title>
+	<desc>Visit instagram page</desc>
+	<circle cx="25" cy="25" r="25" fill="url(#a)"></circle>
+	<path d="M25,13.25c3.83,0,4.28,0,5.79.08a7.93,7.93,0,0,1,2.66.49,4.75,4.75,0,0,1,2.72,2.72,7.93,7.93,0,0,1,.49,2.66c.07,1.51.08,2,.08,5.79s0,4.28-.08,5.79a7.93,7.93,0,0,1-.49,2.66,4.75,4.75,0,0,1-2.72,2.72,7.93,7.93,0,0,1-2.66.49c-1.51.07-2,.08-5.79.08s-4.28,0-5.79-.08a7.93,7.93,0,0,1-2.66-.49,4.75,4.75,0,0,1-2.72-2.72,7.93,7.93,0,0,1-.49-2.66c-.07-1.51-.08-2-.08-5.79s0-4.28.08-5.79a7.93,7.93,0,0,1,.49-2.66,4.75,4.75,0,0,1,2.72-2.72,7.93,7.93,0,0,1,2.66-.49c1.51-.07,2-.08,5.79-.08m0-2.58c-3.89,0-4.38,0-5.91.09a10.52,10.52,0,0,0-3.48.67,7.33,7.33,0,0,0-4.19,4.19,10.52,10.52,0,0,0-.67,3.48c-.07,1.53-.09,2-.09,5.91s0,4.38.09,5.91a10.52,10.52,0,0,0,.67,3.48,7.33,7.33,0,0,0,4.19,4.19,10.52,10.52,0,0,0,3.48.67c1.53.07,2,.09,5.91.09s4.38,0,5.91-.09a10.52,10.52,0,0,0,3.48-.67,7.33,7.33,0,0,0,4.19-4.19,10.52,10.52,0,0,0,.67-3.48c.07-1.53.09-2,.09-5.91s0-4.38-.09-5.91a10.52,10.52,0,0,0-.67-3.48,7.33,7.33,0,0,0-4.19-4.19,10.52,10.52,0,0,0-3.48-.67C29.38,10.69,28.91,10.67,25,10.67Z" fill="#fff"></path>
+	<path d="M25,17.64A7.36,7.36,0,1,0,32.36,25,7.36,7.36,0,0,0,25,17.64Zm0,12.14A4.78,4.78,0,1,1,29.78,25h0A4.78,4.78,0,0,1,25,29.78Z" fill="#fff"></path>
+	<circle cx="32.65" cy="17.35" r="1.72" fill="#fff"></circle>
+</svg>