@eeacms/volto-cca-policy 0.2.34 → 0.2.36

package/CHANGELOG.md

@@ -4,11 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [0.2.34](https://github.com/eea/volto-cca-policy/compare/0.2.33...0.2.34) - 24 May 2024
+### [0.2.36](https://github.com/eea/volto-cca-policy/compare/0.2.35...0.2.36) - 28 May 2024
+
+#### :nail_care: Enhancements
+
+- change: replace Climate-ADAPT logo [kreafox - [`36d1000`](https://github.com/eea/volto-cca-policy/commit/36d10007c840ed4ba4de782704a6485c3784741c)]
+
+### [0.2.35](https://github.com/eea/volto-cca-policy/compare/0.2.34...0.2.35) - 24 May 2024
+
+#### :bug: Bug Fixes
+
+- fix: don't break view without blocks [kreafox - [`0a63710`](https://github.com/eea/volto-cca-policy/commit/0a63710bb682f033b4a9f0f8df51720c10dc7644)]
 
 #### :hammer_and_wrench: Others
 
-- Fix type in event listing [Tiberiu Ichim - [`09b2456`](https://github.com/eea/volto-cca-policy/commit/09b24565c456fc622d46b4d32029bc74c62e619b)]
+- test: increase coverage [kreafox - [`5a349cf`](https://github.com/eea/volto-cca-policy/commit/5a349cf8f2d04f4e491537c3c6d0ed442ac6481f)]
+- test: fix issues reported by sonarqube [kreafox - [`a84e309`](https://github.com/eea/volto-cca-policy/commit/a84e309de1d8da69832a28c0a9bc037a57cd4ddb)]
+- update snapshot [kreafox - [`0e1b2cc`](https://github.com/eea/volto-cca-policy/commit/0e1b2ccf6d3088d5c3867287050d99adcd93f655)]
+### [0.2.34](https://github.com/eea/volto-cca-policy/compare/0.2.33...0.2.34) - 24 May 2024
+
 ### [0.2.33](https://github.com/eea/volto-cca-policy/compare/0.2.32...0.2.33) - 23 May 2024
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/ReadMore/ReadMoreView.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { Button, Icon } from 'semantic-ui-react';
 import { BodyClass } from '@plone/volto/helpers';
 import cx from 'classnames';
@@ -10,64 +10,76 @@ const ReadMoreView = (props) => {
   const isEditMode = mode === 'edit';
   const { label_opened, label_closed, label_position, height } = data;
 
-  const [isReadMore, setIsReadMore] = React.useState(true);
-  const [wrapperHeight, setWrapperHeight] = React.useState(height);
-  const [mounted, setMounted] = React.useState(false);
-  const readMoreRef = React.createRef();
+  const [isReadMore, setIsReadMore] = useState(true);
+  const [wrapperHeight, setWrapperHeight] = useState(height);
+  const [mounted, setMounted] = useState(false);
+  const readMoreRef = useRef(null);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setMounted(true);
   }, []);
 
-  React.useEffect(() => {
+  // Wrap previous siblings (before "Read more" button) in a div
+  useEffect(() => {
     if (isEditMode || !mounted) return;
 
     const button = readMoreRef.current;
     const wrapper = document.createElement('div');
     wrapper.className = 'panel-wrapper';
-
     const nodes = [];
-    let prev_elem = button.previousSibling;
-    while (prev_elem) {
-      nodes.push(prev_elem);
-      prev_elem = prev_elem.previousSibling;
+    let prevElem = button.previousSibling;
+
+    while (prevElem) {
+      nodes.push(prevElem);
+      prevElem = prevElem.previousSibling;
     }
+
     const section = document.getElementsByClassName('panel-wrapper');
     if (section.length > 0) return;
 
-    Array.from(nodes).forEach((e) => {
+    nodes.reverse().forEach((e) => {
       wrapper.appendChild(e);
     });
 
     button.parentNode.insertBefore(wrapper, button);
-    wrapper.append(...Array.from(wrapper.childNodes).reverse());
   }, [mounted, readMoreRef, isEditMode]);
 
-  React.useEffect(() => {
+  // Set the wrapper height
+  useEffect(() => {
     if (isEditMode || !mounted) return;
-
-    const wrapper = document.getElementsByClassName('panel-wrapper')[0];
-
+    const wrapper = document.querySelector('.panel-wrapper');
     if (wrapper) {
       wrapper.style.height = wrapperHeight;
     }
   }, [mounted, wrapperHeight, isEditMode]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     isReadMore ? setWrapperHeight(height) : setWrapperHeight('auto');
   }, [height, isReadMore]);
 
+  const toggleReadMore = () => {
+    if (!isReadMore) {
+      setTimeout(() => {
+        const wrapper = document.querySelector('.panel-wrapper');
+        if (wrapper) {
+          wrapper.scrollIntoView({ behavior: 'smooth' });
+        }
+      }, 100);
+    }
+    setIsReadMore(!isReadMore);
+  };
+
   return (
     <div
       ref={readMoreRef}
       id="read-more-button"
-      className={cx('styled-readMoreBlock', {
+      className={cx('read-more-block', {
         left: label_position === 'left',
         right: label_position === 'right',
       })}
     >
       <BodyClass className={`${isReadMore ? 'closed' : 'opened'}`} />
-      <Button basic icon primary onClick={() => setIsReadMore(!isReadMore)}>
+      <Button basic icon primary onClick={toggleReadMore}>
         {isReadMore ? (
           <>
             <strong>{label_closed || 'Read more'}</strong>
@@ -83,4 +95,5 @@ const ReadMoreView = (props) => {
     </div>
   );
 };
+
 export default ReadMoreView;

package/src/components/manage/Blocks/ReadMore/style.less

@@ -1,4 +1,4 @@
-.styled-readMoreBlock {
+.read-more-block {
   display: flex;
   margin: 1.5em 0;
 

package/src/components/theme/Views/EventView.jsx

@@ -1,13 +1,15 @@
 import React from 'react';
-import {
-  BannerTitle,
-  PortalMessage,
-} from '@eeacms/volto-cca-policy/components';
-import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
-import { Grid, Container, Segment, Button, Icon } from 'semantic-ui-react';
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
-import { SubjectTags, EventDetails } from '@eeacms/volto-cca-policy/helpers';
 import { expandToBackendURL } from '@plone/volto/helpers';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { Grid, Container, Segment, Button, Icon } from 'semantic-ui-react';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+import {
+  SubjectTags,
+  EventDetails,
+  HTMLField,
+} from '@eeacms/volto-cca-policy/helpers';
+import { filterBlocks } from '@eeacms/volto-cca-policy/utils';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 const messages = defineMessages({
   downloadEvent: {
@@ -16,20 +18,39 @@ const messages = defineMessages({
   },
 });
 
-function CcaEventView(props) {
-  const { content } = props;
+function EventView(props) {
   const intl = useIntl();
+  const { content } = props;
+  const {
+    blocks: filtered_blocks,
+    blocks_layout: filtered_blocks_layout,
+    hasBlockType,
+  } = filterBlocks(content, 'tabs_block');
 
   return (
     <div className="cca-event-view">
-      <BannerTitle content={content} />
+      <PortalMessage content={content} />
 
       <Container>
-        <PortalMessage content={content} />
         <Grid columns="12">
           <Grid.Row>
             <Grid.Column mobile={12} tablet={12} computer={8}>
-              <RenderBlocks {...props} />
+              {hasBlockType && (
+                <>
+                  <p className="documentDescription">{content.description}</p>
+                  <HTMLField value={content.text} className="content-text" />
+                </>
+              )}
+
+              <RenderBlocks
+                {...props}
+                content={{
+                  ...content,
+                  blocks: filtered_blocks,
+                  blocks_layout: filtered_blocks_layout,
+                }}
+              />
+
               <SubjectTags {...props} />
             </Grid.Column>
             <Grid.Column mobile={12} tablet={12} computer={4}>
@@ -37,9 +58,9 @@ function CcaEventView(props) {
                 <EventDetails {...props} />
                 {content?.event_url && (
                   <>
-                    <h3>
+                    <h4>
                       <FormattedMessage id="Web" defaultMessage="Web" />
-                    </h3>
+                    </h4>
                     <p>
                       <a href={content.event_url} target="_blank">
                         <FormattedMessage
@@ -79,4 +100,4 @@ function CcaEventView(props) {
   );
 }
 
-export default CcaEventView;
+export default EventView;

package/src/components/theme/Views/EventView.test.jsx

@@ -0,0 +1,143 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import { Provider } from 'react-intl-redux';
+import configureStore from 'redux-mock-store';
+import EventView from './EventView';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
+
+const mockStore = configureStore();
+
+const store = mockStore({
+  intl: {
+    locale: 'en',
+    messages: {},
+  },
+});
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useLocation: () => ({
+    pathname: '/',
+    hash: '',
+    search: '',
+    state: undefined,
+  }),
+}));
+
+jest.mock('@plone/volto/helpers/Loadable/Loadable');
+beforeAll(
+  async () =>
+    await require('@plone/volto/helpers/Loadable/Loadable').__setLoadables(),
+);
+
+const { settings } = config;
+
+test('renders an event view component with all props', () => {
+  const component = renderer.create(
+    <Provider store={store}>
+      <EventView
+        content={{
+          '@id': 'http://localhost:8080/Plone/my-page',
+          title: 'Hello World!',
+          description: 'Hi',
+          text: {
+            data: '<p>Hello World!</p>',
+          },
+          attendees: ['John Doe', 'Mario Rossi'],
+          contact_email: 'test@example.com',
+          contact_name: 'John Doe',
+          contact_phone: '0123456789',
+          end: '2019-06-24T15:20:00+00:00',
+          event_url: 'https://www.example.com',
+          location: 'Volto, Plone',
+          open_end: false,
+          recurrence: 'RRULE:FREQ=DAILY;INTERVAL=7;COUNT=7',
+          start: '2019-06-23T15:20:00+00:00',
+          subjects: ['Volto'],
+          whole_day: false,
+          blocks: {
+            '6cc87646-cbd3-40ea-8b18-8a737b4ec803': {
+              '@type': 'title',
+              copyrightIcon: 'ri-copyright-line',
+              styles: {},
+            },
+          },
+          blocks_layout: {
+            items: ['6cc87646-cbd3-40ea-8b18-8a737b4ec803'],
+          },
+        }}
+      />
+    </Provider>,
+  );
+  const json = component.toJSON();
+  expect(json).toMatchSnapshot();
+});
+
+test('renders an event view component with only required props', () => {
+  const component = renderer.create(
+    <Provider store={store}>
+      <EventView
+        content={{
+          '@id': 'http://localhost:8080/Plone/my-page',
+          title: 'Hello World!',
+          attendees: [],
+          end: '2019-06-23T16:20:00+00:00',
+          start: '2019-06-23T15:20:00+00:00',
+          subjects: ['Volto'],
+          blocks: {
+            '6cc87646-cbd3-40ea-8b18-8a737b4ec803': {
+              '@type': 'title',
+              copyrightIcon: 'ri-copyright-line',
+              styles: {},
+            },
+          },
+          blocks_layout: {
+            items: ['6cc87646-cbd3-40ea-8b18-8a737b4ec803'],
+          },
+        }}
+      />
+    </Provider>,
+  );
+  const json = component.toJSON();
+  expect(json).toMatchSnapshot();
+});
+
+test('renders an event view component without links to api in the text', () => {
+  const component = renderer.create(
+    <Provider store={store}>
+      <EventView
+        content={{
+          '@id': 'http://localhost:8080/Plone/my-page',
+          title: 'Hello World!',
+          attendees: [],
+          end: '2019-06-23T16:20:00+00:00',
+          start: '2019-06-23T15:20:00+00:00',
+          subjects: ['Volto'],
+          text: {
+            data: `<p>Hello World!</p><p>This is an <a href="${settings.apiPath}/foo/bar">internal link</a> and a <a href="${settings.apiPath}/foo/baz">second link</a></p>`,
+          },
+          blocks: {
+            '6cc87646-cbd3-40ea-8b18-8a737b4ec803': {
+              '@type': 'title',
+              copyrightIcon: 'ri-copyright-line',
+              styles: {},
+            },
+          },
+          blocks_layout: {
+            items: ['6cc87646-cbd3-40ea-8b18-8a737b4ec803'],
+          },
+        }}
+      />
+    </Provider>,
+  );
+  const json = component.toJSON();
+  expect(json).toMatchSnapshot();
+});

package/src/components/theme/Views/NewsItemView.jsx

@@ -1,33 +1,51 @@
 import React from 'react';
-import {
-  BannerTitle,
-  PortalMessage,
-} from '@eeacms/volto-cca-policy/components';
 import { Container } from 'semantic-ui-react';
-import { SubjectTags } from '@eeacms/volto-cca-policy/helpers';
+import { filterBlocks } from '@eeacms/volto-cca-policy/utils';
+import { PortalMessage } from '@eeacms/volto-cca-policy/components';
+import { HTMLField, SubjectTags } from '@eeacms/volto-cca-policy/helpers';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
-// import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
+import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
 
-// const Date = (props) => {
-//   const date = props.content?.effective;
-//   return date ? (
-//     <>
-//       <When start={date} end={date} whole_day={true} open_end={false} />
-//     </>
-//   ) : null;
-// };
+const PublicationDate = (props) => {
+  const date = props.content?.effective;
+  return date ? (
+    <div className="news-date-info">
+      Date:
+      <When start={date} end={date} whole_day={true} open_end={false} />
+    </div>
+  ) : null;
+};
 
 function NewsItemView(props) {
   const { content } = props;
+  const {
+    blocks: filtered_blocks,
+    blocks_layout: filtered_blocks_layout,
+    hasBlockType,
+  } = filterBlocks(content, 'tabs_block');
 
   return (
     <div className="cca-newsitem-view">
-      <BannerTitle content={content} />
+      <PortalMessage content={content} />
 
       <Container>
-        <PortalMessage content={content} />
-        <RenderBlocks {...props} />
-        {/* <Date {...props} /> */}
+        {hasBlockType && (
+          <>
+            <p className="documentDescription">{content.description}</p>
+            <HTMLField value={content.text} className="content-text" />
+          </>
+        )}
+
+        <RenderBlocks
+          {...props}
+          content={{
+            ...content,
+            blocks: filtered_blocks,
+            blocks_layout: filtered_blocks_layout,
+          }}
+        />
+
+        <PublicationDate {...props} />
         <SubjectTags {...props} />
       </Container>
     </div>

package/src/helpers/Utils.jsx

@@ -454,9 +454,9 @@ export const EventDetails = (props) => {
 
   return (
     <>
-      <h3>
+      <h4>
         <FormattedMessage id="When" defaultMessage="When" />
-      </h3>
+      </h4>
       <When
         start={content.start}
         end={content.end}
@@ -465,17 +465,17 @@ export const EventDetails = (props) => {
       />
       {content?.location !== null && (
         <>
-          <h3>
+          <h4>
             <FormattedMessage id="Where" defaultMessage="Where" />
-          </h3>
+          </h4>
           <p>{content.location}</p>
         </>
       )}
       {!!content.contact_email && (
         <>
-          <h3>
+          <h4>
             <FormattedMessage id="Info" defaultMessage="Info" />
-          </h3>
+          </h4>
           <p>{content.contact_email}</p>
         </>
       )}

package/src/utils.js

@@ -50,3 +50,23 @@ export const hasTypeOfBlock = (obj, type, name) => {
 
   return false;
 };
+
+export const filterBlocks = (content, block_type) => {
+  const filteredBlocks = { ...content.blocks };
+  const filteredBlocksLayout = { ...content.blocks_layout };
+
+  const filteredBlockUID = Object.keys(filteredBlocks)?.filter(
+    (key) => filteredBlocks[key]['@type'] === block_type,
+  );
+  filteredBlockUID.forEach((key) => delete filteredBlocks[key]);
+  filteredBlocksLayout.items = filteredBlocksLayout?.items?.filter(
+    (item) => !filteredBlockUID.includes(item),
+  );
+  const hasBlockType = filteredBlockUID.length > 0;
+
+  return {
+    blocks: filteredBlocks,
+    blocks_layout: filteredBlocksLayout,
+    hasBlockType,
+  };
+};

package/theme/assets/images/Header/Climate_ADAPT_logo.svg

@@ -1,231 +1,162 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<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 205.7 34.2" style="enable-background:new 0 0 205.7 34.2;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#50B0A4;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#084C7E;}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000021120138511172510570000012852311285464948919_);}
-	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000142169894763135083750000003498552886317596830_);}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000158721215509456588790000013950791660126031801_);}
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000099637223913024369620000014286749596560137652_);}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M53.2,10.5c0,0.9-0.3,1.8-0.8,2.5c-0.5,0.7-1.1,1.3-2,1.7c-0.8,0.4-1.8,0.6-2.9,0.6c-1.8,0-3.2-0.6-4.2-1.7
-				c-1-1.2-1.5-2.8-1.5-4.9V7.9c0-1.3,0.2-2.5,0.7-3.5c0.5-1,1.1-1.8,2-2.3c0.9-0.5,1.9-0.8,3-0.8c1.6,0,3,0.4,4,1.3
-				c1,0.9,1.6,2.1,1.7,3.6H50c0-0.8-0.2-1.4-0.6-1.8c-0.4-0.4-1-0.5-1.8-0.5c-0.8,0-1.4,0.3-1.8,0.9c-0.4,0.6-0.6,1.6-0.6,2.9v1
-				c0,1.4,0.2,2.5,0.5,3.1c0.4,0.6,1,0.9,1.9,0.9c0.7,0,1.3-0.2,1.7-0.5c0.4-0.4,0.6-0.9,0.6-1.7H53.2z"/>
-			<path class="st0" d="M58.4,15h-3.1V0.8h3.1V15z"/>
-			<path class="st0" d="M60.8,2.4c0-0.4,0.2-0.8,0.5-1.1C61.6,1,62,0.9,62.5,0.9c0.5,0,0.9,0.1,1.3,0.4c0.3,0.3,0.5,0.7,0.5,1.1
-				s-0.2,0.8-0.5,1.1c-0.3,0.3-0.7,0.4-1.3,0.4c-0.5,0-0.9-0.1-1.3-0.4C60.9,3.2,60.8,2.8,60.8,2.4z M64.1,15h-3.1V5h3.1V15z"/>
-			<path class="st0" d="M69.5,5l0.1,1.2c0.7-0.9,1.7-1.4,2.9-1.4c1.3,0,2.1,0.5,2.6,1.5c0.7-1,1.7-1.5,3-1.5c2,0,3.1,1.2,3.1,3.7V15
-				H78V8.7c0-0.5-0.1-0.9-0.3-1.1c-0.2-0.2-0.5-0.4-0.9-0.4c-0.6,0-1.1,0.3-1.4,0.8l0,0.1V15h-3.1V8.7c0-0.5-0.1-0.9-0.3-1.1
-				c-0.2-0.2-0.5-0.4-1-0.4c-0.6,0-1.1,0.3-1.4,0.8v7h-3.1V5H69.5z"/>
-			<path class="st0" d="M89,15c-0.1-0.2-0.2-0.5-0.3-0.9c-0.6,0.7-1.4,1.1-2.4,1.1c-0.9,0-1.8-0.3-2.4-0.9c-0.7-0.6-1-1.3-1-2.2
-				c0-1.1,0.4-1.9,1.2-2.5c0.8-0.6,2-0.8,3.5-0.8h1V8.4c0-0.9-0.4-1.4-1.2-1.4c-0.7,0-1.1,0.4-1.1,1.1h-3.1c0-1,0.4-1.8,1.2-2.4
-				s1.9-0.9,3.2-0.9s2.3,0.3,3,0.9c0.7,0.6,1.1,1.5,1.1,2.6v4.5c0,0.9,0.2,1.6,0.4,2.1V15H89z M87.1,13c0.4,0,0.7-0.1,1-0.3
-				c0.3-0.2,0.4-0.4,0.6-0.6v-1.6h-0.9c-1.1,0-1.6,0.5-1.6,1.5c0,0.3,0.1,0.5,0.3,0.7C86.5,12.9,86.8,13,87.1,13z"/>
-			<path class="st0" d="M97.6,2.5V5h1.7v2.2h-1.7v4.6c0,0.4,0.1,0.6,0.2,0.8c0.1,0.1,0.4,0.2,0.8,0.2c0.3,0,0.6,0,0.8-0.1v2.2
-				c-0.6,0.2-1.2,0.3-1.8,0.3c-1.1,0-1.9-0.3-2.4-0.8c-0.5-0.5-0.8-1.3-0.8-2.3v-5h-1.3V5h1.3V2.5H97.6z"/>
-			<path class="st0" d="M105.8,15.2c-1.5,0-2.8-0.5-3.7-1.4c-1-0.9-1.4-2.1-1.4-3.6V10c0-1,0.2-1.9,0.6-2.7c0.4-0.8,0.9-1.4,1.7-1.8
-				c0.7-0.4,1.6-0.6,2.6-0.6c1.4,0,2.5,0.4,3.3,1.3c0.8,0.9,1.2,2.1,1.2,3.7V11h-6.2c0.1,0.6,0.4,1,0.7,1.3c0.4,0.3,0.9,0.5,1.5,0.5
-				c1,0,1.8-0.3,2.3-1l1.4,1.7c-0.4,0.5-0.9,1-1.7,1.3C107.4,15.1,106.6,15.2,105.8,15.2z M105.5,7.2c-0.9,0-1.5,0.6-1.6,1.8h3.2
-				V8.8c0-0.5-0.1-0.9-0.4-1.2C106.3,7.3,106,7.2,105.5,7.2z"/>
-			<path class="st0" d="M56.4,31.5H52l-0.8,2.5h-3.5l5-13.5h3.1l5,13.5h-3.5L56.4,31.5z M52.7,29h2.9l-1.5-4.7L52.7,29z"/>
-			<path class="st0" d="M61.8,34.1V20.5h4.4c1.2,0,2.3,0.3,3.2,0.8c1,0.5,1.7,1.3,2.2,2.3c0.5,1,0.8,2.1,0.8,3.3v0.6
-				c0,1.2-0.3,2.4-0.8,3.3c-0.5,1-1.3,1.8-2.2,2.3c-1,0.6-2,0.8-3.2,0.8H61.8z M65,23v8.5h1.1c0.9,0,1.7-0.3,2.2-1
-				c0.5-0.7,0.8-1.7,0.8-3V27c0-1.3-0.3-2.3-0.8-3c-0.5-0.7-1.2-1-2.2-1H65z"/>
-			<path class="st0" d="M81.8,31.5h-4.5l-0.8,2.5h-3.5l5-13.5h3.1l5,13.5h-3.5L81.8,31.5z M78.1,29H81l-1.5-4.7L78.1,29z"/>
-			<path class="st0" d="M90.4,29.5v4.6h-3.3V20.5h5.4c1,0,2,0.2,2.7,0.6c0.8,0.4,1.4,0.9,1.8,1.6c0.4,0.7,0.7,1.5,0.7,2.4
-				c0,1.3-0.5,2.4-1.4,3.2c-0.9,0.8-2.2,1.2-3.9,1.2H90.4z M90.4,26.9h2.1c0.6,0,1.1-0.2,1.4-0.5c0.3-0.3,0.5-0.8,0.5-1.3
-				c0-0.6-0.2-1.1-0.5-1.5c-0.3-0.4-0.8-0.6-1.4-0.6h-2.2V26.9z"/>
-			<path class="st0" d="M110.2,23h-4.1v11h-3.3V23h-4v-2.5h11.3V23z"/>
-		</g>
-	</g>
-	<g>
-		<path class="st0" d="M124.6,5.2c0-0.2-0.1-0.4-0.2-0.5c-0.2-0.1-0.4-0.2-0.8-0.4s-0.7-0.3-1-0.4c-0.6-0.3-1-0.8-1-1.4
-			c0-0.3,0.1-0.6,0.3-0.8c0.2-0.2,0.4-0.4,0.7-0.6c0.3-0.1,0.7-0.2,1.1-0.2c0.4,0,0.8,0.1,1.1,0.2c0.3,0.1,0.6,0.4,0.7,0.6
-			s0.3,0.6,0.3,0.9h-1.2c0-0.3-0.1-0.5-0.2-0.6c-0.2-0.1-0.4-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.7,0.2s-0.2,0.3-0.2,0.5
-			c0,0.2,0.1,0.3,0.3,0.5s0.5,0.2,0.8,0.3c0.7,0.2,1.1,0.4,1.4,0.7c0.3,0.3,0.5,0.7,0.5,1.1c0,0.5-0.2,0.9-0.6,1.2
-			c-0.4,0.3-0.9,0.4-1.5,0.4c-0.4,0-0.8-0.1-1.2-0.2c-0.4-0.2-0.6-0.4-0.8-0.7c-0.2-0.3-0.3-0.6-0.3-1h1.2c0,0.6,0.4,0.9,1.1,0.9
-			c0.3,0,0.5-0.1,0.6-0.2C124.6,5.6,124.6,5.4,124.6,5.2z"/>
-		<path class="st0" d="M131.2,6.7H130V4.3h-2.3v2.4h-1.2V1.1h1.2v2.3h2.3V1.1h1.2V6.7z"/>
-		<path class="st0" d="M135.5,5.6h-2L133,6.7h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2L135.5,5.6z M133.7,4.6h1.4l-0.7-2.1L133.7,4.6z"/>
-		<path class="st0" d="M139.7,4.6h-0.9v2.1h-1.2V1.1h2.1c0.7,0,1.2,0.1,1.5,0.4c0.4,0.3,0.5,0.7,0.5,1.3c0,0.4-0.1,0.7-0.3,1
-			c-0.2,0.3-0.4,0.5-0.8,0.6l1.2,2.3v0.1h-1.3L139.7,4.6z M138.8,3.7h0.9c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.2-0.4,0.2-0.6
-			c0-0.3-0.1-0.5-0.2-0.6C140.3,2.1,140,2,139.7,2h-0.9V3.7z"/>
-		<path class="st0" d="M143.9,6.7h-1.2V1.1h1.2V6.7z"/>
-		<path class="st0" d="M149.6,6.7h-1.2L146.2,3v3.7H145V1.1h1.2l2.3,3.7V1.1h1.2V6.7z"/>
-		<path class="st0" d="M155.1,6c-0.2,0.3-0.5,0.4-0.9,0.6c-0.4,0.1-0.8,0.2-1.3,0.2c-0.5,0-0.9-0.1-1.3-0.3
-			c-0.4-0.2-0.7-0.5-0.9-0.9s-0.3-0.9-0.3-1.4V3.7c0-0.6,0.1-1.1,0.3-1.5c0.2-0.4,0.5-0.7,0.8-0.9c0.4-0.2,0.8-0.3,1.3-0.3
-			c0.7,0,1.2,0.2,1.6,0.5c0.4,0.3,0.6,0.8,0.7,1.4H154c-0.1-0.3-0.2-0.6-0.3-0.7c-0.2-0.2-0.4-0.2-0.7-0.2c-0.4,0-0.7,0.1-0.9,0.4
-			c-0.2,0.3-0.3,0.7-0.3,1.3v0.4c0,0.6,0.1,1,0.3,1.3c0.2,0.3,0.6,0.5,1,0.5c0.4,0,0.7-0.1,0.9-0.3v-1h-1.1V3.7h2.2V6z"/>
-		<path class="st0" d="M161.2,5.6h-2l-0.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2L161.2,5.6z M159.5,4.6h1.4l-0.7-2.1L159.5,4.6z"/>
-		<path class="st0" d="M163.4,6.7V1.1h1.7c0.5,0,0.9,0.1,1.3,0.3c0.4,0.2,0.7,0.5,0.9,1c0.2,0.4,0.3,0.9,0.3,1.4V4
-			c0,0.5-0.1,1-0.3,1.4c-0.2,0.4-0.5,0.7-0.9,1c-0.4,0.2-0.8,0.3-1.3,0.3H163.4z M164.5,2v3.8h0.6c0.5,0,0.8-0.1,1-0.4
-			c0.2-0.3,0.4-0.7,0.4-1.3V3.8c0-0.6-0.1-1-0.4-1.3c-0.2-0.3-0.6-0.4-1-0.4H164.5z"/>
-		<path class="st0" d="M171.7,5.6h-2l-0.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2L171.7,5.6z M170,4.6h1.4l-0.7-2.1L170,4.6z"/>
-		<path class="st0" d="M175.1,4.7v2h-1.2V1.1h2.2c0.4,0,0.8,0.1,1.1,0.2s0.6,0.4,0.7,0.7c0.2,0.3,0.3,0.6,0.3,1c0,0.6-0.2,1-0.6,1.3
-			c-0.4,0.3-0.9,0.5-1.6,0.5H175.1z M175.1,3.8h1c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.2-0.4,0.2-0.6c0-0.3-0.1-0.5-0.2-0.7
-			c-0.2-0.2-0.4-0.3-0.7-0.3h-1.1V3.8z"/>
-		<path class="st0" d="M183.3,2h-1.7v4.7h-1.2V2h-1.7V1.1h4.6V2z"/>
-		<path class="st0" d="M186.7,5.6h-2l-0.4,1.2H183l2.1-5.7h1.1l2.1,5.7h-1.2L186.7,5.6z M184.9,4.6h1.4l-0.7-2.1L184.9,4.6z"/>
-		<path class="st0" d="M192.6,2h-1.7v4.7h-1.2V2H188V1.1h4.6V2z"/>
-		<path class="st0" d="M194.5,6.7h-1.2V1.1h1.2V6.7z"/>
-		<path class="st0" d="M200.3,4c0,0.6-0.1,1-0.3,1.5s-0.5,0.7-0.8,1c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3
-			c-0.4-0.2-0.7-0.5-0.9-1c-0.2-0.4-0.3-0.9-0.3-1.4V3.8c0-0.6,0.1-1,0.3-1.5c0.2-0.4,0.5-0.7,0.9-1c0.4-0.2,0.8-0.3,1.3-0.3
-			c0.5,0,0.9,0.1,1.3,0.3c0.4,0.2,0.6,0.6,0.9,1c0.2,0.4,0.3,0.9,0.3,1.5V4z M199.1,3.8c0-0.6-0.1-1-0.3-1.4
-			c-0.2-0.3-0.5-0.5-0.9-0.5c-0.4,0-0.7,0.2-0.9,0.5c-0.2,0.3-0.3,0.7-0.3,1.3V4c0,0.6,0.1,1,0.3,1.3c0.2,0.3,0.5,0.5,0.9,0.5
-			c0.4,0,0.7-0.2,0.9-0.5c0.2-0.3,0.3-0.8,0.3-1.3V3.8z"/>
-		<path class="st0" d="M205.7,6.7h-1.2L202.3,3v3.7h-1.2V1.1h1.2l2.3,3.7V1.1h1.2V6.7z"/>
-		<path class="st0" d="M123.5,13.6l-0.6,0.7v1.6h-1.2v-5.7h1.2v2.6l0.5-0.7l1.4-1.9h1.4l-2,2.5l2.1,3.1h-1.4L123.5,13.6z"/>
-		<path class="st0" d="M131.3,15.8h-1.2l-2.3-3.7v3.7h-1.2v-5.7h1.2l2.3,3.7v-3.7h1.2V15.8z"/>
-		<path class="st0" d="M137,13.1c0,0.6-0.1,1-0.3,1.5c-0.2,0.4-0.5,0.7-0.8,1c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3
-			c-0.4-0.2-0.7-0.5-0.9-1c-0.2-0.4-0.3-0.9-0.3-1.4v-0.3c0-0.6,0.1-1,0.3-1.5c0.2-0.4,0.5-0.7,0.9-1c0.4-0.2,0.8-0.3,1.3-0.3
-			c0.5,0,0.9,0.1,1.3,0.3c0.4,0.2,0.6,0.6,0.9,1c0.2,0.4,0.3,0.9,0.3,1.5V13.1z M135.8,12.9c0-0.6-0.1-1-0.3-1.4
-			c-0.2-0.3-0.5-0.5-0.9-0.5c-0.4,0-0.7,0.2-0.9,0.5c-0.2,0.3-0.3,0.7-0.3,1.3v0.3c0,0.6,0.1,1,0.3,1.3c0.2,0.3,0.5,0.5,0.9,0.5
-			c0.4,0,0.7-0.2,0.9-0.5c0.2-0.3,0.3-0.8,0.3-1.3V12.9z"/>
-		<path class="st0" d="M142.3,14.2l0.8-4h1.2l-1.3,5.7h-1.2l-0.9-3.8l-0.9,3.8h-1.2l-1.3-5.7h1.2l0.8,4l0.9-4h1L142.3,14.2z"/>
-		<path class="st0" d="M146,14.9h2.5v0.9h-3.6v-5.7h1.2V14.9z"/>
-		<path class="st0" d="M152.5,13.4h-2.2v1.5h2.6v0.9h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V13.4z"/>
-		<path class="st0" d="M153.6,15.8v-5.7h1.7c0.5,0,0.9,0.1,1.3,0.3c0.4,0.2,0.7,0.5,0.9,1c0.2,0.4,0.3,0.9,0.3,1.4v0.3
-			c0,0.5-0.1,1-0.3,1.4c-0.2,0.4-0.5,0.7-0.9,1c-0.4,0.2-0.8,0.3-1.3,0.3H153.6z M154.8,11.1v3.8h0.6c0.5,0,0.8-0.1,1-0.4
-			c0.2-0.3,0.4-0.7,0.4-1.3v-0.3c0-0.6-0.1-1-0.4-1.3c-0.2-0.3-0.6-0.4-1-0.4H154.8z"/>
-		<path class="st0" d="M163.2,15.1c-0.2,0.3-0.5,0.4-0.9,0.6c-0.4,0.1-0.8,0.2-1.3,0.2c-0.5,0-0.9-0.1-1.3-0.3
-			c-0.4-0.2-0.7-0.5-0.9-0.9c-0.2-0.4-0.3-0.9-0.3-1.4v-0.4c0-0.6,0.1-1.1,0.3-1.5c0.2-0.4,0.5-0.7,0.8-0.9c0.4-0.2,0.8-0.3,1.3-0.3
-			c0.7,0,1.2,0.2,1.6,0.5c0.4,0.3,0.6,0.8,0.7,1.4h-1.1c-0.1-0.3-0.2-0.6-0.3-0.7c-0.2-0.2-0.4-0.2-0.7-0.2c-0.4,0-0.7,0.1-0.9,0.4
-			c-0.2,0.3-0.3,0.7-0.3,1.3v0.4c0,0.6,0.1,1,0.3,1.3c0.2,0.3,0.6,0.5,1,0.5c0.4,0,0.7-0.1,0.9-0.3v-1H161v-0.9h2.2V15.1z"/>
-		<path class="st0" d="M167.6,13.4h-2.2v1.5h2.6v0.9h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V13.4z"/>
-		<path class="st0" d="M174,13.5h-2.2v2.3h-1.2v-5.7h3.7v0.9h-2.5v1.5h2.2V13.5z"/>
-		<path class="st0" d="M179.6,13.1c0,0.6-0.1,1-0.3,1.5c-0.2,0.4-0.5,0.7-0.8,1c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3
-			c-0.4-0.2-0.7-0.5-0.9-1c-0.2-0.4-0.3-0.9-0.3-1.4v-0.3c0-0.6,0.1-1,0.3-1.5c0.2-0.4,0.5-0.7,0.9-1c0.4-0.2,0.8-0.3,1.3-0.3
-			c0.5,0,0.9,0.1,1.3,0.3c0.4,0.2,0.6,0.6,0.9,1c0.2,0.4,0.3,0.9,0.3,1.5V13.1z M178.4,12.9c0-0.6-0.1-1-0.3-1.4
-			c-0.2-0.3-0.5-0.5-0.9-0.5c-0.4,0-0.7,0.2-0.9,0.5c-0.2,0.3-0.3,0.7-0.3,1.3v0.3c0,0.6,0.1,1,0.3,1.3c0.2,0.3,0.5,0.5,0.9,0.5
-			c0.4,0,0.7-0.2,0.9-0.5s0.3-0.8,0.3-1.3V12.9z"/>
-		<path class="st0" d="M182.6,13.8h-0.9v2.1h-1.2v-5.7h2.1c0.7,0,1.2,0.1,1.5,0.4c0.4,0.3,0.5,0.7,0.5,1.3c0,0.4-0.1,0.7-0.3,1
-			c-0.2,0.3-0.4,0.5-0.8,0.6l1.2,2.3v0.1h-1.3L182.6,13.8z M181.6,12.8h0.9c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.2-0.4,0.2-0.6
-			c0-0.3-0.1-0.5-0.2-0.6c-0.2-0.2-0.4-0.2-0.7-0.2h-0.9V12.8z"/>
-		<path class="st0" d="M124.9,23.8h-2l-0.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2L124.9,23.8z M123.2,22.9h1.4l-0.7-2.1L123.2,22.9z"/>
-		<path class="st0" d="M133.5,23.1c0,0.6-0.3,1.1-0.7,1.4c-0.4,0.3-0.9,0.5-1.6,0.5c-0.7,0-1.3-0.2-1.7-0.7c-0.4-0.5-0.6-1.2-0.6-2
-			v-0.3c0-0.5,0.1-1,0.3-1.4c0.2-0.4,0.5-0.7,0.8-1c0.4-0.2,0.8-0.3,1.2-0.3c0.7,0,1.2,0.2,1.6,0.5c0.4,0.3,0.6,0.8,0.7,1.5h-1.2
-			c0-0.4-0.1-0.6-0.3-0.8c-0.2-0.2-0.4-0.2-0.8-0.2c-0.4,0-0.7,0.1-0.9,0.4c-0.2,0.3-0.3,0.7-0.3,1.3v0.4c0,0.6,0.1,1.1,0.3,1.3
-			c0.2,0.3,0.5,0.4,0.9,0.4c0.4,0,0.6-0.1,0.8-0.2c0.2-0.2,0.3-0.4,0.3-0.8H133.5z"/>
-		<path class="st0" d="M135.4,24h2.5V25h-3.6v-5.7h1.2V24z"/>
-		<path class="st0" d="M139.8,25h-1.2v-5.7h1.2V25z"/>
-		<path class="st0" d="M142.4,19.3l1.5,4.1l1.4-4.1h1.5V25h-1.2v-1.5l0.1-2.7l-1.5,4.2h-0.8l-1.5-4.2l0.1,2.7V25h-1.2v-5.7H142.4z"
-			/>
-		<path class="st0" d="M151,23.8h-2l-0.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2L151,23.8z M149.3,22.9h1.4l-0.7-2.1L149.3,22.9z"/>
-		<path class="st0" d="M157,20.2h-1.7V25h-1.2v-4.7h-1.7v-0.9h4.6V20.2z"/>
-		<path class="st0" d="M161,22.5h-2.2V24h2.6V25h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V22.5z"/>
-		<path class="st0" d="M164.2,23H162v-0.9h2.2V23z"/>
-		<path class="st0" d="M167.3,22.9h-0.9V25h-1.2v-5.7h2.1c0.7,0,1.2,0.1,1.5,0.4c0.4,0.3,0.5,0.7,0.5,1.3c0,0.4-0.1,0.7-0.3,1
-			c-0.2,0.3-0.4,0.5-0.8,0.6l1.2,2.3V25h-1.3L167.3,22.9z M166.3,21.9h0.9c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.2-0.4,0.2-0.6
-			c0-0.3-0.1-0.5-0.2-0.6c-0.2-0.2-0.4-0.2-0.7-0.2h-0.9V21.9z"/>
-		<path class="st0" d="M173.7,22.5h-2.2V24h2.6V25h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V22.5z"/>
-		<path class="st0" d="M177.7,23.5c0-0.2-0.1-0.4-0.2-0.5c-0.2-0.1-0.4-0.2-0.8-0.4c-0.4-0.1-0.7-0.3-1-0.4c-0.6-0.3-1-0.8-1-1.4
-			c0-0.3,0.1-0.6,0.3-0.8c0.2-0.2,0.4-0.4,0.7-0.6c0.3-0.1,0.7-0.2,1.1-0.2c0.4,0,0.8,0.1,1.1,0.2c0.3,0.1,0.6,0.4,0.7,0.6
-			c0.2,0.3,0.3,0.6,0.3,0.9h-1.2c0-0.3-0.1-0.5-0.2-0.6c-0.2-0.1-0.4-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.2,0.3-0.2,0.5
-			c0,0.2,0.1,0.3,0.3,0.5c0.2,0.1,0.5,0.2,0.8,0.3c0.7,0.2,1.1,0.4,1.4,0.7c0.3,0.3,0.5,0.7,0.5,1.1c0,0.5-0.2,0.9-0.6,1.2
-			c-0.4,0.3-0.9,0.4-1.5,0.4c-0.4,0-0.8-0.1-1.2-0.2c-0.4-0.2-0.6-0.4-0.8-0.7c-0.2-0.3-0.3-0.6-0.3-1h1.2c0,0.6,0.4,0.9,1.1,0.9
-			c0.3,0,0.5-0.1,0.6-0.2C177.6,23.8,177.7,23.7,177.7,23.5z"/>
-		<path class="st0" d="M180.9,25h-1.2v-5.7h1.2V25z"/>
-		<path class="st0" d="M183.1,24h2.5V25h-3.6v-5.7h1.2V24z"/>
-		<path class="st0" d="M187.5,25h-1.2v-5.7h1.2V25z"/>
-		<path class="st0" d="M192,22.5h-2.2V24h2.6V25h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V22.5z"/>
-		<path class="st0" d="M197.6,25h-1.2l-2.3-3.7V25H193v-5.7h1.2l2.3,3.7v-3.7h1.2V25z"/>
-		<path class="st0" d="M202.9,20.2h-1.7V25H200v-4.7h-1.7v-0.9h4.6V20.2z"/>
-		<path class="st0" d="M125.1,31.6h-2.2v1.5h2.6v0.9h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V31.6z"/>
-		<path class="st0" d="M130.5,28.4v3.7c0,0.6-0.2,1.1-0.6,1.5c-0.4,0.4-0.9,0.5-1.6,0.5c-0.7,0-1.2-0.2-1.6-0.5
-			c-0.4-0.3-0.6-0.8-0.6-1.4v-3.8h1.2v3.7c0,0.4,0.1,0.6,0.3,0.8c0.2,0.2,0.4,0.3,0.7,0.3c0.7,0,1-0.3,1-1v-3.8H130.5z"/>
-		<path class="st0" d="M133.5,32h-0.9v2.1h-1.2v-5.7h2.1c0.7,0,1.2,0.1,1.5,0.4c0.4,0.3,0.5,0.7,0.5,1.3c0,0.4-0.1,0.7-0.3,1
-			c-0.2,0.3-0.4,0.5-0.8,0.6l1.2,2.3v0.1h-1.3L133.5,32z M132.6,31.1h0.9c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.2-0.4,0.2-0.6
-			c0-0.3-0.1-0.5-0.2-0.6s-0.4-0.2-0.7-0.2h-0.9V31.1z"/>
-		<path class="st0" d="M141.1,31.4c0,0.6-0.1,1-0.3,1.5c-0.2,0.4-0.5,0.7-0.8,1c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3
-			c-0.4-0.2-0.7-0.5-0.9-1c-0.2-0.4-0.3-0.9-0.3-1.4v-0.3c0-0.6,0.1-1,0.3-1.5c0.2-0.4,0.5-0.7,0.9-1c0.4-0.2,0.8-0.3,1.3-0.3
-			c0.5,0,0.9,0.1,1.3,0.3c0.4,0.2,0.6,0.6,0.9,1c0.2,0.4,0.3,0.9,0.3,1.5V31.4z M139.9,31.1c0-0.6-0.1-1-0.3-1.4
-			c-0.2-0.3-0.5-0.5-0.9-0.5c-0.4,0-0.7,0.2-0.9,0.5c-0.2,0.3-0.3,0.7-0.3,1.3v0.3c0,0.6,0.1,1,0.3,1.3c0.2,0.3,0.5,0.5,0.9,0.5
-			c0.4,0,0.7-0.2,0.9-0.5c0.2-0.3,0.3-0.8,0.3-1.3V31.1z"/>
-		<path class="st0" d="M143.1,32.1v2H142v-5.7h2.2c0.4,0,0.8,0.1,1.1,0.2s0.6,0.4,0.7,0.7c0.2,0.3,0.3,0.6,0.3,1
-			c0,0.6-0.2,1-0.6,1.3c-0.4,0.3-0.9,0.5-1.6,0.5H143.1z M143.1,31.1h1c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.2-0.4,0.2-0.6
-			c0-0.3-0.1-0.5-0.2-0.7c-0.2-0.2-0.4-0.3-0.7-0.3h-1.1V31.1z"/>
-		<path class="st0" d="M150.5,31.6h-2.2v1.5h2.6v0.9h-3.8v-5.7h3.8v0.9h-2.6v1.3h2.2V31.6z"/>
-	</g>
-	<g>
-		
-			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-9.3347" y1="114.2806" x2="7.9797" y2="114.2806" gradientTransform="matrix(0.9998 -2.141162e-02 2.141162e-02 0.9998 12.5711 -105.5454)">
-			<stop  offset="0" style="stop-color:#68ACA2"/>
-			<stop  offset="1" style="stop-color:#4A9287"/>
-		</linearGradient>
-		<path class="st1" d="M15.8,8.2L15.8,8.2L15.8,8.2c-0.2-0.2-0.4-0.4-0.5-0.7c-1.4-2.6-4.5-5-9.7-3.9c3,1.1,1.3,5.3,5.9,7
-			c0.8,0.3,1.5,0.8,2.1,1.3l1.2,1.1c2.1,2,4.5,1.1,5.8-0.3l2.3-2.5C19.6,12.6,15.8,8.2,15.8,8.2z"/>
-		<path class="st2" d="M15.8,8.2c1.7,1.6,1.9,1.6,3.6-0.1l4.3-4.6c2,1.8,3.2,2.7,1.1,4.9L23,10.3C19.6,12.6,15.8,8.2,15.8,8.2z"/>
-		<path class="st2" d="M19.4,4.5c1-1.1,1-2.8-0.1-3.8c-1.1-1-2.8-1-3.8,0.1c-1,1.1-1,2.8,0.1,3.8C16.7,5.6,18.4,5.6,19.4,4.5z"/>
-		<g>
-			<path class="st3" d="M14.6,10.7c-0.6-1.3-1.5-2.5-2.5-3.5c-1.3-1.4-2.7-2.4-4.9-3.1l0,0c3,1.3,4.4,2.7,6.2,5.1L14.6,10.7
-				L14.6,10.7z"/>
-			<line class="st3" x1="13.3" y1="6.7" x2="13.3" y2="6.7"/>
-		</g>
-	</g>
-	<g>
-		
-			<linearGradient id="SVGID_00000099651853801439593270000009162195687036646301_" gradientUnits="userSpaceOnUse" x1="-4.1983" y1="131.1247" x2="13.1161" y2="131.1247" gradientTransform="matrix(0.9998 -2.141162e-02 2.141162e-02 0.9998 12.5711 -105.5454)">
-			<stop  offset="0" style="stop-color:#68ACA2"/>
-			<stop  offset="1" style="stop-color:#4A9287"/>
-		</linearGradient>
-		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000099651853801439593270000009162195687036646301_);" d="
-			M18.4,26L18.4,26L18.4,26c0.2,0.2,0.4,0.4,0.5,0.7c1.4,2.6,4.5,5,9.7,3.9c-3-1.1-1.3-5.3-5.9-7c-0.8-0.3-1.5-0.8-2.1-1.3l-1.2-1.1
-			c-2.1-2-4.5-1.1-5.8,0.3l-2.3,2.5C14.6,21.6,18.4,26,18.4,26z"/>
-		
-			<linearGradient id="SVGID_00000085248305237230361540000011166907915524265600_" gradientUnits="userSpaceOnUse" x1="-9856.4629" y1="-1230.1086" x2="-9849.3242" y2="-1237.2477" gradientTransform="matrix(-0.9998 2.141162e-02 -2.141162e-02 -0.9998 -9864.999 -994.6747)">
-			<stop  offset="5.154640e-03" style="stop-color:#18304F"/>
-			<stop  offset="1" style="stop-color:#2F6BAF"/>
-		</linearGradient>
-		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000085248305237230361540000011166907915524265600_);" d="
-			M18.4,26c-1.7-1.6-1.9-1.6-3.6,0.1l-4.3,4.6c-2-1.8-3.2-2.7-1.1-4.9l1.8-1.9C14.6,21.6,18.4,26,18.4,26z"/>
-		<path class="st2" d="M14.8,29.7c-1,1.1-1,2.8,0.1,3.8c1.1,1,2.8,1,3.8-0.1c1-1.1,1-2.8-0.1-3.8C17.5,28.5,15.8,28.6,14.8,29.7z"/>
-		<g>
-			<path class="st3" d="M19.5,23.4c0.6,1.3,1.5,2.5,2.5,3.5c1.3,1.4,2.7,2.4,4.9,3.1l0,0c-3-1.3-4.4-2.7-6.2-5.1L19.5,23.4
-				L19.5,23.4z"/>
-			<line class="st3" x1="20.9" y1="27.5" x2="20.9" y2="27.5"/>
-		</g>
-	</g>
-	<g>
-		
-			<linearGradient id="SVGID_00000039843924412303729850000001200730030714720392_" gradientUnits="userSpaceOnUse" x1="-4171.2041" y1="-5572.6338" x2="-4153.8901" y2="-5572.6338" gradientTransform="matrix(2.141162e-02 0.9998 -0.9998 2.141162e-02 -5456.7754 4295.2524)">
-			<stop  offset="0" style="stop-color:#68ACA2"/>
-			<stop  offset="1" style="stop-color:#4A9287"/>
-		</linearGradient>
-		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000039843924412303729850000001200730030714720392_);" d="
-			M26,15.8L26,15.8L26,15.8c0.2-0.2,0.4-0.4,0.7-0.5c2.6-1.4,5-4.5,3.9-9.7c-1.1,3-5.3,1.3-7,5.9c-0.3,0.8-0.8,1.5-1.3,2.1l-1.1,1.2
-			c-2,2.1-1.1,4.5,0.3,5.8l2.5,2.3C21.6,19.6,26,15.8,26,15.8z"/>
-		<path class="st2" d="M26,15.8c-1.6,1.7-1.6,1.9,0.1,3.6l4.6,4.3c-1.8,2-2.7,3.2-4.9,1.1L23.9,23C21.6,19.6,26,15.8,26,15.8z"/>
-		<path class="st2" d="M29.7,19.4c1.1,1,2.8,1,3.8-0.1c1-1.1,1-2.8-0.1-3.8c-1.1-1-2.8-1-3.8,0.1C28.5,16.7,28.6,18.4,29.7,19.4z"/>
-		<g>
-			<path class="st3" d="M23.4,14.6c1.3-0.6,2.5-1.5,3.5-2.5c1.4-1.3,2.4-2.7,3.1-4.9l0,0c-1.3,3-2.7,4.4-5.1,6.2L23.4,14.6
-				L23.4,14.6z"/>
-			<line class="st3" x1="27.5" y1="13.3" x2="27.5" y2="13.3"/>
-		</g>
-	</g>
-	<g>
-		
-			<linearGradient id="SVGID_00000156547888875951700950000014469192736794511514_" gradientUnits="userSpaceOnUse" x1="-4166.0679" y1="-5555.7896" x2="-4148.7534" y2="-5555.7896" gradientTransform="matrix(2.141162e-02 0.9998 -0.9998 2.141162e-02 -5456.7754 4295.2524)">
-			<stop  offset="0" style="stop-color:#68ACA2"/>
-			<stop  offset="1" style="stop-color:#4A9287"/>
-		</linearGradient>
-		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000156547888875951700950000014469192736794511514_);" d="
-			M8.2,18.4L8.2,18.4L8.2,18.4c-0.2,0.2-0.4,0.4-0.7,0.5c-2.6,1.4-5,4.5-3.9,9.7c1.1-3,5.3-1.3,7-5.9c0.3-0.8,0.8-1.5,1.3-2.1
-			l1.1-1.2c2-2.1,1.1-4.5-0.3-5.8l-2.5-2.3C12.6,14.6,8.2,18.4,8.2,18.4z"/>
-		<path class="st2" d="M8.2,18.4c1.6-1.7,1.6-1.9-0.1-3.6l-4.6-4.3c1.8-2,2.7-3.2,4.9-1.1l1.9,1.8C12.6,14.6,8.2,18.4,8.2,18.4z"/>
-		<path class="st2" d="M4.5,14.8c-1.1-1-2.8-1-3.8,0.1c-1,1.1-1,2.8,0.1,3.8c1.1,1,2.8,1,3.8-0.1C5.6,17.5,5.6,15.8,4.5,14.8z"/>
-		<g>
-			<path class="st3" d="M10.7,19.5C9.4,20.2,8.2,21,7.2,22c-1.4,1.3-2.4,2.7-3.1,4.9l0,0c1.3-3,2.7-4.4,5.1-6.2L10.7,19.5L10.7,19.5
-				z"/>
-			<line class="st3" x1="6.7" y1="20.9" x2="6.7" y2="20.9"/>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 205.7 34.2">
+  <defs>
+    <style>
+      .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8, .cls-9 {
+        stroke-width: 0px;
+      }
+
+      .cls-1, .cls-2, .cls-4, .cls-5, .cls-6, .cls-7, .cls-9 {
+        fill-rule: evenodd;
+      }
+
+      .cls-1, .cls-8 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        fill: url(#linear-gradient-3);
+      }
+
+      .cls-3 {
+        fill: #289588;
+      }
+
+      .cls-4 {
+        fill: url(#linear-gradient);
+      }
+
+      .cls-5 {
+        fill: url(#linear-gradient-2);
+      }
+
+      .cls-6 {
+        fill: url(#linear-gradient-5);
+      }
+
+      .cls-7 {
+        fill: #084c7e;
+      }
+
+      .cls-9 {
+        fill: url(#linear-gradient-4);
+      }
+    </style>
+    <linearGradient id="linear-gradient" x1="-9.3" y1="114.3" x2="8" y2="114.3" gradientTransform="translate(12.6 -105.5) rotate(-1.2)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#68aca2"/>
+      <stop offset="1" stop-color="#4a9287"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="-4.2" y1="131.1" x2="13.1" y2="131.1" xlink:href="#linear-gradient"/>
+    <linearGradient id="linear-gradient-3" x1="-9856.5" y1="-1230.1" x2="-9849.3" y2="-1237.2" gradientTransform="translate(-9865 -994.7) rotate(178.8)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#18304f"/>
+      <stop offset="1" stop-color="#2f6baf"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-4" x1="-4171.2" y1="-5572.6" x2="-4153.9" y2="-5572.6" gradientTransform="translate(-5456.8 4295.3) rotate(88.8)" xlink:href="#linear-gradient"/>
+    <linearGradient id="linear-gradient-5" x1="-4166.1" y1="-5555.8" x2="-4148.8" y2="-5555.8" gradientTransform="translate(-5456.8 4295.3) rotate(88.8)" xlink:href="#linear-gradient"/>
+  </defs>
+  <g>
+    <path class="cls-3" d="M53.2,10.5c0,.9-.3,1.8-.8,2.5-.5.7-1.1,1.3-2,1.7-.8.4-1.8.6-2.9.6-1.8,0-3.2-.6-4.2-1.7-1-1.2-1.5-2.8-1.5-4.9v-.7c0-1.3.2-2.5.7-3.5.5-1,1.1-1.8,2-2.3.9-.5,1.9-.8,3-.8,1.6,0,3,.4,4,1.3,1,.9,1.6,2.1,1.7,3.6h-3.3c0-.8-.2-1.4-.6-1.8-.4-.4-1-.5-1.8-.5s-1.4.3-1.8.9c-.4.6-.6,1.6-.6,2.9v1c0,1.4.2,2.5.5,3.1.4.6,1,.9,1.9.9s1.3-.2,1.7-.5c.4-.4.6-.9.6-1.7h3.2Z"/>
+    <path class="cls-3" d="M58.4,15h-3.1V.8h3.1v14.3Z"/>
+    <path class="cls-3" d="M60.8,2.4c0-.4.2-.8.5-1.1.3-.3.7-.4,1.3-.4s.9.1,1.3.4c.3.3.5.7.5,1.1s-.2.8-.5,1.1c-.3.3-.7.4-1.3.4s-.9-.1-1.3-.4c-.3-.3-.5-.7-.5-1.1ZM64.1,15h-3.1V5h3.1v10.1Z"/>
+    <path class="cls-3" d="M69.5,5v1.2c.8-.9,1.8-1.4,3-1.4s2.1.5,2.6,1.5c.7-1,1.7-1.5,3-1.5,2,0,3.1,1.2,3.1,3.7v6.5h-3.1v-6.3c0-.5,0-.9-.3-1.1-.2-.2-.5-.4-.9-.4s-1.1.3-1.4.8h0v7h-3.1v-6.3c0-.5,0-.9-.3-1.1-.2-.2-.5-.4-1-.4s-1.1.3-1.4.8v7h-3.1V5h2.9Z"/>
+    <path class="cls-3" d="M89,15c-.1-.2-.2-.5-.3-.9-.6.7-1.4,1.1-2.4,1.1s-1.8-.3-2.4-.9c-.7-.6-1-1.3-1-2.2s.4-1.9,1.2-2.5c.8-.6,2-.8,3.5-.8h1v-.5c0-.9-.4-1.4-1.2-1.4s-1.1.4-1.1,1.1h-3.1c0-1,.4-1.8,1.2-2.4s1.9-.9,3.2-.9,2.3.3,3,.9c.7.6,1.1,1.5,1.1,2.6v4.5c0,.9.2,1.6.4,2.1v.2h-3.1ZM87.1,13c.4,0,.7,0,1-.3.3-.2.4-.4.6-.6v-1.6h-.9c-1.1,0-1.6.5-1.6,1.5s0,.5.3.7c.2.2.4.3.7.3Z"/>
+    <path class="cls-3" d="M97.6,2.5v2.5h1.7v2.2h-1.7v4.6c0,.4,0,.6.2.8.1.1.4.2.8.2s.6,0,.8,0v2.2c-.6.2-1.2.3-1.8.3-1.1,0-1.9-.3-2.4-.8-.5-.5-.8-1.3-.8-2.3v-5h-1.3v-2.2h1.3v-2.5h3.1Z"/>
+    <path class="cls-3" d="M105.8,15.2c-1.5,0-2.8-.5-3.7-1.4-1-.9-1.4-2.1-1.4-3.6v-.3c0-1,.2-1.9.6-2.7.4-.8.9-1.4,1.7-1.8.7-.4,1.6-.6,2.6-.6s2.5.4,3.3,1.3c.8.9,1.2,2.1,1.2,3.7v1.2h-6.2c.1.6.4,1,.7,1.3.4.3.9.5,1.5.5,1,0,1.8-.3,2.3-1l1.4,1.7c-.4.5-.9,1-1.7,1.3s-1.5.5-2.3.5ZM105.5,7.2c-.9,0-1.5.6-1.6,1.8h3.2v-.2c0-.5-.1-.9-.4-1.2-.3-.3-.6-.4-1.1-.4Z"/>
+    <path class="cls-3" d="M56.4,31.5h-4.5l-.8,2.5h-3.5l5-13.5h3.1l5,13.5h-3.5l-.8-2.5ZM52.7,29h2.9l-1.5-4.7-1.5,4.7Z"/>
+    <path class="cls-3" d="M61.8,34.1v-13.5h4.4c1.2,0,2.3.3,3.2.8,1,.5,1.7,1.3,2.2,2.3.5,1,.8,2.1.8,3.3v.6c0,1.2-.3,2.4-.8,3.3-.5,1-1.3,1.8-2.2,2.3-1,.6-2,.8-3.2.8h-4.5ZM65,23v8.5h1.1c.9,0,1.7-.3,2.2-1,.5-.7.8-1.7.8-3v-.6c0-1.3-.3-2.3-.8-3-.5-.7-1.2-1-2.2-1h-1.1Z"/>
+    <path class="cls-3" d="M81.8,31.5h-4.5l-.8,2.5h-3.5l5-13.5h3.1l5,13.5h-3.5l-.8-2.5ZM78.1,29h2.9l-1.5-4.7-1.5,4.7Z"/>
+    <path class="cls-3" d="M90.4,29.5v4.6h-3.3v-13.5h5.4c1,0,2,.2,2.7.6.8.4,1.4.9,1.8,1.6.4.7.7,1.5.7,2.4,0,1.3-.5,2.4-1.4,3.2-.9.8-2.2,1.2-3.9,1.2h-2.1ZM90.4,26.9h2.1c.6,0,1.1-.2,1.4-.5.3-.3.5-.8.5-1.3s-.2-1.1-.5-1.5c-.3-.4-.8-.6-1.4-.6h-2.2v3.9Z"/>
+    <path class="cls-3" d="M110.2,23h-4.1v11h-3.3v-11h-4v-2.5h11.3v2.5Z"/>
+  </g>
+  <g>
+    <path class="cls-3" d="M124.6,5.2c0-.2,0-.4-.2-.5-.2-.1-.4-.2-.8-.4s-.7-.3-1-.4c-.6-.3-1-.8-1-1.4s0-.6.3-.8c.2-.2.4-.4.7-.6.3-.1.7-.2,1.1-.2s.8,0,1.1.2c.3.1.6.4.7.6s.3.6.3.9h-1.2c0-.3,0-.5-.2-.6-.2-.1-.4-.2-.7-.2s-.5,0-.7.2-.2.3-.2.5,0,.3.3.5.5.2.8.3c.7.2,1.1.4,1.4.7.3.3.5.7.5,1.1s-.2.9-.6,1.2c-.4.3-.9.4-1.5.4s-.8,0-1.2-.2c-.4-.2-.6-.4-.8-.7-.2-.3-.3-.6-.3-1h1.2c0,.6.4.9,1.1.9s.5,0,.6-.2c.2-.1.2-.3.2-.5Z"/>
+    <path class="cls-3" d="M131.2,6.7h-1.2v-2.4h-2.3v2.4h-1.2V1.1h1.2v2.3h2.3V1.1h1.2v5.7Z"/>
+    <path class="cls-3" d="M135.5,5.6h-2l-.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2l-.4-1.2ZM133.7,4.6h1.4l-.7-2.1-.7,2.1Z"/>
+    <path class="cls-3" d="M139.7,4.6h-.9v2.1h-1.2V1.1h2.1c.7,0,1.2.1,1.5.4.4.3.5.7.5,1.3s0,.7-.3,1c-.2.3-.4.5-.8.6l1.2,2.3h0c0,0-1.3,0-1.3,0l-1.1-2.1ZM138.8,3.7h.9c.3,0,.5,0,.7-.2.2-.1.2-.4.2-.6s0-.5-.2-.6-.4-.2-.7-.2h-.9v1.7Z"/>
+    <path class="cls-3" d="M143.9,6.7h-1.2V1.1h1.2v5.7Z"/>
+    <path class="cls-3" d="M149.6,6.7h-1.2l-2.3-3.7v3.7h-1.2V1.1h1.2l2.3,3.7V1.1h1.2v5.7Z"/>
+    <path class="cls-3" d="M155.1,6c-.2.3-.5.4-.9.6-.4.1-.8.2-1.3.2s-.9-.1-1.3-.3c-.4-.2-.7-.5-.9-.9s-.3-.9-.3-1.4v-.4c0-.6,0-1.1.3-1.5.2-.4.5-.7.8-.9.4-.2.8-.3,1.3-.3s1.2.2,1.6.5c.4.3.6.8.7,1.4h-1.1c0-.3-.2-.6-.3-.7-.2-.2-.4-.2-.7-.2s-.7.1-.9.4c-.2.3-.3.7-.3,1.3v.4c0,.6.1,1,.3,1.3.2.3.6.5,1,.5s.7,0,.9-.3v-1h-1.1v-.9h2.2v2.3Z"/>
+    <path class="cls-3" d="M161.2,5.6h-2l-.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2l-.4-1.2ZM159.5,4.6h1.4l-.7-2.1-.7,2.1Z"/>
+    <path class="cls-3" d="M163.4,6.7V1.1h1.7c.5,0,.9.1,1.3.3.4.2.7.5.9,1,.2.4.3.9.3,1.4v.3c0,.5-.1,1-.3,1.4-.2.4-.5.7-.9,1-.4.2-.8.3-1.3.3h-1.8ZM164.5,2v3.8h.6c.5,0,.8-.1,1-.4.2-.3.4-.7.4-1.3v-.3c0-.6-.1-1-.4-1.3-.2-.3-.6-.4-1-.4h-.6Z"/>
+    <path class="cls-3" d="M171.7,5.6h-2l-.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2l-.4-1.2ZM170,4.6h1.4l-.7-2.1-.7,2.1Z"/>
+    <path class="cls-3" d="M175.1,4.7v2h-1.2V1.1h2.2c.4,0,.8,0,1.1.2s.6.4.7.7c.2.3.3.6.3,1,0,.6-.2,1-.6,1.3-.4.3-.9.5-1.6.5h-1ZM175.1,3.8h1c.3,0,.5,0,.7-.2s.2-.4.2-.6,0-.5-.2-.7c-.2-.2-.4-.3-.7-.3h-1.1v1.8Z"/>
+    <path class="cls-3" d="M183.3,2h-1.7v4.7h-1.2V2h-1.7v-.9h4.6v.9Z"/>
+    <path class="cls-3" d="M186.7,5.6h-2l-.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2l-.4-1.2ZM184.9,4.6h1.4l-.7-2.1-.7,2.1Z"/>
+    <path class="cls-3" d="M192.6,2h-1.7v4.7h-1.2V2h-1.7v-.9h4.6v.9Z"/>
+    <path class="cls-3" d="M194.5,6.7h-1.2V1.1h1.2v5.7Z"/>
+    <path class="cls-3" d="M200.3,4c0,.6,0,1-.3,1.5s-.5.7-.8,1c-.4.2-.8.3-1.3.3s-.9-.1-1.3-.3c-.4-.2-.7-.5-.9-1s-.3-.9-.3-1.4v-.3c0-.6.1-1,.3-1.5.2-.4.5-.7.9-1,.4-.2.8-.3,1.3-.3s.9.1,1.3.3c.4.2.6.6.9,1,.2.4.3.9.3,1.5v.3ZM199.1,3.8c0-.6-.1-1-.3-1.4-.2-.3-.5-.5-.9-.5s-.7.2-.9.5c-.2.3-.3.7-.3,1.3v.3c0,.6.1,1,.3,1.3.2.3.5.5.9.5s.7-.2.9-.5c.2-.3.3-.8.3-1.3v-.3Z"/>
+    <path class="cls-3" d="M205.7,6.7h-1.2l-2.3-3.7v3.7h-1.2V1.1h1.2l2.3,3.7V1.1h1.2v5.7Z"/>
+    <path class="cls-3" d="M123.5,13.6l-.6.7v1.6h-1.2v-5.7h1.2v2.6l.5-.7,1.4-1.9h1.4l-2,2.5,2.1,3.1h-1.4l-1.5-2.3Z"/>
+    <path class="cls-3" d="M131.3,15.8h-1.2l-2.3-3.7v3.7h-1.2v-5.7h1.2l2.3,3.7v-3.7h1.2v5.7Z"/>
+    <path class="cls-3" d="M137,13.1c0,.6,0,1-.3,1.5s-.5.7-.8,1-.8.3-1.3.3-.9-.1-1.3-.3c-.4-.2-.7-.5-.9-1-.2-.4-.3-.9-.3-1.4v-.3c0-.6.1-1,.3-1.5.2-.4.5-.7.9-1,.4-.2.8-.3,1.3-.3s.9.1,1.3.3c.4.2.6.6.9,1,.2.4.3.9.3,1.5v.3ZM135.8,12.9c0-.6-.1-1-.3-1.4-.2-.3-.5-.5-.9-.5s-.7.2-.9.5c-.2.3-.3.7-.3,1.3v.3c0,.6.1,1,.3,1.3.2.3.5.5.9.5s.7-.2.9-.5c.2-.3.3-.8.3-1.3v-.3Z"/>
+    <path class="cls-3" d="M142.3,14.2l.8-4h1.2l-1.3,5.7h-1.2l-.9-3.8-.9,3.8h-1.2l-1.3-5.7h1.2l.8,4,.9-4h1l.9,4Z"/>
+    <path class="cls-3" d="M146,14.9h2.5v.9h-3.6v-5.7h1.2v4.7Z"/>
+    <path class="cls-3" d="M152.5,13.4h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+    <path class="cls-3" d="M153.6,15.8v-5.7h1.7c.5,0,.9.1,1.3.3.4.2.7.5.9,1,.2.4.3.9.3,1.4v.3c0,.5-.1,1-.3,1.4-.2.4-.5.7-.9,1-.4.2-.8.3-1.3.3h-1.8ZM154.8,11.1v3.8h.6c.5,0,.8-.1,1-.4.2-.3.4-.7.4-1.3v-.3c0-.6-.1-1-.4-1.3-.2-.3-.6-.4-1-.4h-.6Z"/>
+    <path class="cls-3" d="M163.2,15.1c-.2.3-.5.4-.9.6-.4.1-.8.2-1.3.2s-.9-.1-1.3-.3c-.4-.2-.7-.5-.9-.9-.2-.4-.3-.9-.3-1.4v-.4c0-.6,0-1.1.3-1.5.2-.4.5-.7.8-.9.4-.2.8-.3,1.3-.3s1.2.2,1.6.5c.4.3.6.8.7,1.4h-1.1c0-.3-.2-.6-.3-.7-.2-.2-.4-.2-.7-.2s-.7.1-.9.4c-.2.3-.3.7-.3,1.3v.4c0,.6.1,1,.3,1.3.2.3.6.5,1,.5s.7,0,.9-.3v-1h-1.1v-.9h2.2v2.3Z"/>
+    <path class="cls-3" d="M167.6,13.4h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+    <path class="cls-3" d="M174,13.5h-2.2v2.3h-1.2v-5.7h3.7v.9h-2.5v1.5h2.2v.9Z"/>
+    <path class="cls-3" d="M179.6,13.1c0,.6,0,1-.3,1.5-.2.4-.5.7-.8,1-.4.2-.8.3-1.3.3s-.9-.1-1.3-.3c-.4-.2-.7-.5-.9-1-.2-.4-.3-.9-.3-1.4v-.3c0-.6.1-1,.3-1.5.2-.4.5-.7.9-1,.4-.2.8-.3,1.3-.3s.9.1,1.3.3c.4.2.6.6.9,1,.2.4.3.9.3,1.5v.3ZM178.4,12.9c0-.6-.1-1-.3-1.4-.2-.3-.5-.5-.9-.5s-.7.2-.9.5c-.2.3-.3.7-.3,1.3v.3c0,.6.1,1,.3,1.3.2.3.5.5.9.5s.7-.2.9-.5.3-.8.3-1.3v-.3Z"/>
+    <path class="cls-3" d="M182.6,13.8h-.9v2.1h-1.2v-5.7h2.1c.7,0,1.2.1,1.5.4.4.3.5.7.5,1.3s0,.7-.3,1c-.2.3-.4.5-.8.6l1.2,2.3h0c0,0-1.3,0-1.3,0l-1.1-2.1ZM181.6,12.8h.9c.3,0,.5,0,.7-.2.2-.1.2-.4.2-.6s0-.5-.2-.6-.4-.2-.7-.2h-.9v1.7Z"/>
+    <path class="cls-3" d="M124.9,23.8h-2l-.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2l-.4-1.2ZM123.2,22.9h1.4l-.7-2.1-.7,2.1Z"/>
+    <path class="cls-3" d="M133.5,23.1c0,.6-.3,1.1-.7,1.4-.4.3-.9.5-1.6.5s-1.3-.2-1.7-.7c-.4-.5-.6-1.2-.6-2v-.3c0-.5,0-1,.3-1.4.2-.4.5-.7.8-1,.4-.2.8-.3,1.2-.3s1.2.2,1.6.5c.4.3.6.8.7,1.5h-1.2c0-.4-.1-.6-.3-.8-.2-.2-.4-.2-.8-.2s-.7.1-.9.4c-.2.3-.3.7-.3,1.3v.4c0,.6,0,1.1.3,1.3.2.3.5.4.9.4s.6,0,.8-.2c.2-.2.3-.4.3-.8h1.2Z"/>
+    <path class="cls-3" d="M135.4,24h2.5v.9h-3.6v-5.7h1.2v4.7Z"/>
+    <path class="cls-3" d="M139.8,25h-1.2v-5.7h1.2v5.7Z"/>
+    <path class="cls-3" d="M142.4,19.3l1.5,4.1,1.4-4.1h1.5v5.7h-1.2v-4.2c.1,0-1.4,4.2-1.4,4.2h-.8l-1.5-4.2v2.7c.1,0,.1,1.5.1,1.5h-1.2v-5.7h1.5Z"/>
+    <path class="cls-3" d="M151,23.8h-2l-.4,1.2h-1.2l2.1-5.7h1.1l2.1,5.7h-1.2l-.4-1.2ZM149.3,22.9h1.4l-.7-2.1-.7,2.1Z"/>
+    <path class="cls-3" d="M157,20.2h-1.7v4.7h-1.2v-4.7h-1.7v-.9h4.6v.9Z"/>
+    <path class="cls-3" d="M161,22.5h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+    <path class="cls-3" d="M164.2,23h-2.2v-.9h2.2v.9Z"/>
+    <path class="cls-3" d="M167.3,22.9h-.9v2.1h-1.2v-5.7h2.1c.7,0,1.2.1,1.5.4.4.3.5.7.5,1.3s0,.7-.3,1c-.2.3-.4.5-.8.6l1.2,2.3h0c0,0-1.3,0-1.3,0l-1.1-2.1ZM166.3,21.9h.9c.3,0,.5,0,.7-.2.2-.1.2-.4.2-.6s0-.5-.2-.6-.4-.2-.7-.2h-.9v1.7Z"/>
+    <path class="cls-3" d="M173.7,22.5h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+    <path class="cls-3" d="M177.7,23.5c0-.2,0-.4-.2-.5-.2-.1-.4-.2-.8-.4-.4-.1-.7-.3-1-.4-.6-.3-1-.8-1-1.4s0-.6.3-.8c.2-.2.4-.4.7-.6.3-.1.7-.2,1.1-.2s.8,0,1.1.2c.3.1.6.4.7.6.2.3.3.6.3.9h-1.2c0-.3,0-.5-.2-.6-.2-.1-.4-.2-.7-.2s-.5,0-.7.2c-.2.1-.2.3-.2.5s0,.3.3.5c.2.1.5.2.8.3.7.2,1.1.4,1.4.7.3.3.5.7.5,1.1s-.2.9-.6,1.2c-.4.3-.9.4-1.5.4s-.8,0-1.2-.2-.6-.4-.8-.7c-.2-.3-.3-.6-.3-1h1.2c0,.6.4.9,1.1.9s.5,0,.6-.2c.2-.1.2-.3.2-.5Z"/>
+    <path class="cls-3" d="M180.9,25h-1.2v-5.7h1.2v5.7Z"/>
+    <path class="cls-3" d="M183.1,24h2.5v.9h-3.6v-5.7h1.2v4.7Z"/>
+    <path class="cls-3" d="M187.5,25h-1.2v-5.7h1.2v5.7Z"/>
+    <path class="cls-3" d="M192,22.5h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+    <path class="cls-3" d="M197.6,25h-1.2l-2.3-3.7v3.7h-1.2v-5.7h1.2l2.3,3.7v-3.7h1.2v5.7Z"/>
+    <path class="cls-3" d="M202.9,20.2h-1.7v4.7h-1.2v-4.7h-1.7v-.9h4.6v.9Z"/>
+    <path class="cls-3" d="M125.1,31.6h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+    <path class="cls-3" d="M130.5,28.4v3.7c0,.6-.2,1.1-.6,1.5s-.9.5-1.6.5-1.2-.2-1.6-.5c-.4-.3-.6-.8-.6-1.4v-3.8h1.2v3.7c0,.4,0,.6.3.8.2.2.4.3.7.3.7,0,1-.3,1-1v-3.8h1.2Z"/>
+    <path class="cls-3" d="M133.5,32h-.9v2.1h-1.2v-5.7h2.1c.7,0,1.2.1,1.5.4.4.3.5.7.5,1.3s0,.7-.3,1c-.2.3-.4.5-.8.6l1.2,2.3h0c0,0-1.3,0-1.3,0l-1.1-2.1ZM132.6,31.1h.9c.3,0,.5,0,.7-.2.2-.1.2-.4.2-.6s0-.5-.2-.6-.4-.2-.7-.2h-.9v1.7Z"/>
+    <path class="cls-3" d="M141.1,31.4c0,.6,0,1-.3,1.5-.2.4-.5.7-.8,1-.4.2-.8.3-1.3.3s-.9-.1-1.3-.3c-.4-.2-.7-.5-.9-1-.2-.4-.3-.9-.3-1.4v-.3c0-.6.1-1,.3-1.5.2-.4.5-.7.9-1,.4-.2.8-.3,1.3-.3s.9.1,1.3.3c.4.2.6.6.9,1,.2.4.3.9.3,1.5v.3ZM139.9,31.1c0-.6-.1-1-.3-1.4-.2-.3-.5-.5-.9-.5s-.7.2-.9.5c-.2.3-.3.7-.3,1.3v.3c0,.6.1,1,.3,1.3.2.3.5.5.9.5s.7-.2.9-.5.3-.8.3-1.3v-.3Z"/>
+    <path class="cls-3" d="M143.1,32.1v2h-1.2v-5.7h2.2c.4,0,.8,0,1.1.2s.6.4.7.7c.2.3.3.6.3,1,0,.6-.2,1-.6,1.3-.4.3-.9.5-1.6.5h-1ZM143.1,31.1h1c.3,0,.5,0,.7-.2s.2-.4.2-.6,0-.5-.2-.7c-.2-.2-.4-.3-.7-.3h-1.1v1.8Z"/>
+    <path class="cls-3" d="M150.5,31.6h-2.2v1.5h2.6v.9h-3.8v-5.7h3.8v.9h-2.6v1.3h2.2v.9Z"/>
+  </g>
+  <g>
+    <path class="cls-4" d="M15.8,8.2h0s0,0,0,0c-.2-.2-.4-.4-.5-.7-1.4-2.6-4.5-5-9.7-3.9,3,1.1,1.3,5.3,5.9,7s1.5.8,2.1,1.3l1.2,1.1c2.1,2,4.5,1.1,5.8-.3l2.3-2.5c-3.5,2.3-7.2-2.1-7.2-2.1Z"/>
+    <path class="cls-7" d="M15.8,8.2c1.7,1.6,1.9,1.6,3.6-.1l4.3-4.6c2,1.8,3.2,2.7,1.1,4.9l-1.8,1.9c-3.5,2.3-7.2-2.1-7.2-2.1Z"/>
+    <path class="cls-7" d="M19.4,4.5c1-1.1,1-2.8-.1-3.8-1.1-1-2.8-1-3.8.1-1,1.1-1,2.8.1,3.8,1.1,1,2.8,1,3.8-.1Z"/>
+    <g>
+      <path class="cls-1" d="M14.6,10.7c-.6-1.3-1.5-2.5-2.5-3.5s-2.7-2.4-4.9-3.1h0c3,1.4,4.4,2.7,6.2,5.1l1.2,1.5h0Z"/>
+      <line class="cls-8" x1="13.3" y1="6.7" x2="13.3" y2="6.7"/>
+    </g>
+  </g>
+  <g>
+    <path class="cls-5" d="M18.4,26h0s0,0,0,0c.2.2.4.4.5.7,1.4,2.6,4.5,5,9.7,3.9-3-1.1-1.3-5.3-5.9-7-.8-.3-1.5-.8-2.1-1.3l-1.2-1.1c-2.1-2-4.5-1.1-5.8.3l-2.3,2.5c3.5-2.3,7.2,2.1,7.2,2.1Z"/>
+    <path class="cls-2" d="M18.4,26c-1.7-1.6-1.9-1.6-3.6.1l-4.3,4.6c-2-1.8-3.2-2.7-1.1-4.9l1.8-1.9c3.5-2.3,7.2,2.1,7.2,2.1Z"/>
+    <path class="cls-7" d="M14.8,29.7c-1,1.1-1,2.8.1,3.8,1.1,1,2.8,1,3.8-.1,1-1.1,1-2.8-.1-3.8-1.1-1-2.8-1-3.8.1Z"/>
+    <g>
+      <path class="cls-1" d="M19.5,23.4c.6,1.3,1.5,2.5,2.5,3.5s2.7,2.4,4.9,3.1h0c-3-1.4-4.4-2.7-6.2-5.1l-1.2-1.5h0Z"/>
+      <line class="cls-8" x1="20.9" y1="27.5" x2="20.9" y2="27.5"/>
+    </g>
+  </g>
+  <g>
+    <path class="cls-9" d="M26,15.8h0s0,0,0,0c.2-.2.4-.4.7-.5,2.6-1.4,5-4.5,3.9-9.7-1.1,3-5.3,1.3-7,5.9s-.8,1.5-1.3,2.1l-1.1,1.2c-2,2.1-1.1,4.5.3,5.8l2.5,2.3c-2.3-3.5,2.1-7.2,2.1-7.2Z"/>
+    <path class="cls-7" d="M26,15.8c-1.6,1.7-1.6,1.9.1,3.6l4.6,4.3c-1.8,2-2.7,3.2-4.9,1.1l-1.9-1.8c-2.3-3.5,2.1-7.2,2.1-7.2Z"/>
+    <path class="cls-7" d="M29.7,19.4c1.1,1,2.8,1,3.8-.1,1-1.1,1-2.8-.1-3.8-1.1-1-2.8-1-3.8.1-1,1.1-1,2.8.1,3.8Z"/>
+    <g>
+      <path class="cls-1" d="M23.4,14.6c1.3-.6,2.5-1.5,3.5-2.5s2.4-2.7,3.1-4.9h0c-1.3,3-2.7,4.4-5.1,6.2l-1.5,1.2h0Z"/>
+      <line class="cls-8" x1="27.5" y1="13.3" x2="27.5" y2="13.3"/>
+    </g>
+  </g>
+  <g>
+    <path class="cls-6" d="M8.2,18.4h0s0,0,0,0c-.2.2-.4.4-.7.5-2.6,1.4-5,4.5-3.9,9.7,1.1-3,5.3-1.3,7-5.9s.8-1.5,1.3-2.1l1.1-1.2c2-2.1,1.1-4.5-.3-5.8l-2.5-2.3c2.3,3.5-2.1,7.2-2.1,7.2Z"/>
+    <path class="cls-7" d="M8.2,18.4c1.6-1.7,1.6-1.9-.1-3.6l-4.6-4.3c1.8-2,2.7-3.2,4.9-1.1l1.9,1.8c2.3,3.5-2.1,7.2-2.1,7.2Z"/>
+    <path class="cls-7" d="M4.5,14.8c-1.1-1-2.8-1-3.8.1-1,1.1-1,2.8.1,3.8,1.1,1,2.8,1,3.8-.1,1-1.1,1-2.8-.1-3.8Z"/>
+    <g>
+      <path class="cls-1" d="M10.7,19.5c-1.3.6-2.5,1.5-3.5,2.5s-2.4,2.7-3.1,4.9h0c1.3-3,2.7-4.4,5.1-6.2l1.5-1.2h0Z"/>
+      <line class="cls-8" x1="6.7" y1="20.9" x2="6.7" y2="20.9"/>
+    </g>
+  </g>
+</svg>

package/theme/globals/views.less

@@ -302,3 +302,17 @@ hr {
     }
   }
 }
+
+.cca-newsitem-view,
+.cca-event-view {
+  .news-date-info {
+    display: flex;
+    gap: 3px;
+    justify-content: flex-end;
+  }
+
+  .content-text p {
+    margin: 0em 0em 1em;
+    line-height: 1.5;
+  }
+}