From c37f3afb99d06768dc6dbca7ee43a5f7d1ec2b6a Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 18 Apr 2023 13:20:01 +0200
Subject: [PATCH 1/5] remove unused SCSS definitions and update app with a
 footer

---
 webapp/src/App.tsx                           |   7 +-
 webapp/src/components/global/GeantFooter.tsx |  50 +++++++++
 webapp/src/main.scss                         | 107 +++++--------------
 3 files changed, 83 insertions(+), 81 deletions(-)
 create mode 100644 webapp/src/components/global/GeantFooter.tsx

diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx
index 5dbd117b..1d26fe5a 100644
--- a/webapp/src/App.tsx
+++ b/webapp/src/App.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement } from "react";
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 import Landing from "./pages/Landing";
 import ExternalPageNavBar from "./components/global/ExternalPageNavBar";
-import About from "./pages/About";
+import GeantFooter from "./components/global/GeantFooter";
 import DataAnalysis from "./pages/DataAnalysis";
 import AnnualReport from "./pages/AnnualReport";
 import CompendiumData from "./pages/CompendiumData";
@@ -12,19 +12,20 @@ import ChargingStructurePage from "./pages/ChargingStructure";
 
 function App(): ReactElement {
   return (
-    <div>
+    <div className="app">
       <Router>
         <ExternalPageNavBar />
         <Routes>
           <Route path="/data" element={<CompendiumData />} />
-          <Route path="/about" element={<About />} />
           <Route path="/analysis" element={<DataAnalysis />} />
           <Route path="/report" element={<AnnualReport />} />
           <Route path="/funding" element={<FundingSourcePage />} />
           <Route path="/charging" element={<ChargingStructurePage />} />
           <Route path="*" element={<Landing />} />
         </Routes>
+        <GeantFooter/>
       </Router>
+      
     </div>
   );
 }
diff --git a/webapp/src/components/global/GeantFooter.tsx b/webapp/src/components/global/GeantFooter.tsx
new file mode 100644
index 00000000..5f7299e5
--- /dev/null
+++ b/webapp/src/components/global/GeantFooter.tsx
@@ -0,0 +1,50 @@
+import React, { ReactElement } from "react";
+import { Container, Row, Col } from "react-bootstrap";
+import GeantLogo from "../../images/geant_logo_colored.svg";
+import EULogo from "../../images/eu_logo.png";
+
+
+
+function GeantFooter(): ReactElement {
+    return <footer className="page-footer">
+        <Container>
+            <Row>
+                <Col align="left">
+                    <h5 style={{ color: "#fff" }}>GÉANT Compendium</h5>
+                    <p style={{ color: "#f5f5f5" }}>The global reach of the GÉANT network enables scientists and academics in Europe to exchange data and collaborate with their peers across the world through links to National Research and Education Networks in 65 countries around the world.</p>
+                    <p style={{ color: "#f5f5f5" }}>To learn more about the organisations that make up the GÉANT community, navigate the reports presented on this site.</p>
+                </Col>
+            </Row>
+        </Container>
+        <Container>
+            <Row>
+                <div>
+                    <p style={{ color: "#f5f5f5" }}>
+                        The project is co-funded by Europe's NRENs and the EU.
+                    </p>
+                </div>
+                <Row>
+                    <div>
+                        <img src={EULogo} />
+                    </div>
+                </Row>
+                <Row>
+                    <div className="col s1">
+                        <a href="https://geant.org">
+                            <img src={GeantLogo} style={{maxWidth: "100px", paddingTop:"20px"}} />
+                        </a>
+                    </div>
+                    <div className="col s10 offset-s1">
+                        <p style={{ color: "#f5f5f5" }}>
+                            The contents of this site are the sole responsibility
+                            of GÉANT and can under no circumstances be regarded
+                            as reflecting the views of the European Union</p>
+                    </div>
+                </Row>
+
+            </Row>
+        </Container>
+    </footer>;
+}
+
+export default GeantFooter
\ No newline at end of file
diff --git a/webapp/src/main.scss b/webapp/src/main.scss
index 59466dd7..70c72b99 100644
--- a/webapp/src/main.scss
+++ b/webapp/src/main.scss
@@ -1,103 +1,54 @@
 @import 'scss/base/text';
 @import 'scss/layout/components';
 
-table {
-  min-width: 650px;
-}
-
-thead {
-  background-color: lightgray;
-}
-
-.state_true {
-  background-color: lightgreen;
-}
-
-.state_false {
-  background-color: red;
-}
-
-$border-color: #064c6e !default;
-$text-color: #377592 !default;
-$queue_link_hover: #ffffff !default;
-
-.title-background {
-  background-image: url("images/compendium_header.png");
-  background-color: #064c6e;
-  vertical-align: center;
-  padding-bottom: 15px;
-  padding-bottom: 15px;
-}
-
-$footer-height: 75px !default;
-
-.footer-img {
-  width: 55px;
-  height: 38px
-}
-
-.footer {
-  margin-top: 8px;
-  background-color: #064c6e;
-  font-size: 8px;
-  height: 75px;
-  color: black;
-  width: 100%;
-  padding: 15px;
-  clear: both;
-}
-
-.footer-text {
-  color: white;
-  margin-left: 30px;
-}
-
-.px {
-  padding-left: 55px;
-}
-
-.header-naviagtion {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  min-width: 10vh;
-  background: #064c6e;
-  color: white
-}
-
-.nav-links {
-  width: 50%;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  list-style: none;
-}
-
 .external-page-nav-bar {
   background-color: #003753;
   color: #b0cde1;
-  padding-top: 10px;
+  height: 60px;
+  display: flex;
+  -webkit-box-align: center;
+  align-items: center;
 
   img {
     float: left;
+    margin-right: 15px;
   }
 
   ul {
+    line-height: 1.3;
+    text-transform: uppercase;
     list-style: none;
-    float: left;
-    margin-bottom: 0;
 
     li {
       float: left;
-      padding: 10px;
 
       a {
+        border-radius: 2px;
+        float: left;
         font-family: "Open Sans";
-        font-size: 14px;
-        font-weight: 400;
+        font-size: 0.9rem;
+        font-weight: 600;
         text-decoration: none;
         color: #b0cde1;
+        padding: 10px;
+      }
+
+      a:hover {
+        color: #003753;
+        background-color: #b0cde1;
       }
     }
   }
+}
+
+.app {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+}
+
+.content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
 }
\ No newline at end of file
-- 
GitLab


From 1697dbdeeed4b9acd4a862ff74787f587623353b Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 18 Apr 2023 13:21:45 +0200
Subject: [PATCH 2/5] Update navbar to be similar to the geant.org one Use
 media queries for wrapping text differently on smaller screens

---
 webapp/src/Navigation.tsx                     | 37 --------------
 .../components/global/ExternalPageFooter.tsx  |  9 ----
 .../components/global/ExternalPageNavBar.tsx  | 33 +++++++------
 webapp/src/scss/layout/_components.scss       | 49 ++++++++++++++++++-
 4 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 webapp/src/Navigation.tsx
 delete mode 100644 webapp/src/components/global/ExternalPageFooter.tsx

diff --git a/webapp/src/Navigation.tsx b/webapp/src/Navigation.tsx
deleted file mode 100644
index 495acd16..00000000
--- a/webapp/src/Navigation.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, {ReactElement} from 'react';
-import {Link} from 'react-router-dom'
-
-// const api_url = window.location.origin+'/';
-
-// console.log(api_url)
-
-function Navigation(): ReactElement {
-
-  const navStyle ={ 
-    color: 'white'
-  }
-
-  return (
-    <nav className='header-naviagtion'>
-        <ul className='nav-links'>
-          <li>
-            <Link  style={navStyle} to="/about">
-              About
-            </Link>
-          </li>
-          <li>
-            <Link  style={navStyle} to="/report">
-              Annual Report
-            </Link>
-          </li>
-          <li>
-            <Link  style={navStyle} to="/analysis">
-              Data Analysis
-            </Link>
-          </li>
-        </ul>
-    </nav>
-  );
-}
-
-export default Navigation;
diff --git a/webapp/src/components/global/ExternalPageFooter.tsx b/webapp/src/components/global/ExternalPageFooter.tsx
deleted file mode 100644
index 158da048..00000000
--- a/webapp/src/components/global/ExternalPageFooter.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React, {ReactElement} from "react";
-
-function ExternalPageFooter(): ReactElement {
-    return (<div>
-
-    </div>);
-}
-
-export default ExternalPageFooter
\ No newline at end of file
diff --git a/webapp/src/components/global/ExternalPageNavBar.tsx b/webapp/src/components/global/ExternalPageNavBar.tsx
index 1e52bdc2..4b0608ec 100644
--- a/webapp/src/components/global/ExternalPageNavBar.tsx
+++ b/webapp/src/components/global/ExternalPageNavBar.tsx
@@ -1,5 +1,5 @@
-import React, {ReactElement} from "react";
-import {Container, Row, Col} from "react-bootstrap";
+import React, { ReactElement } from "react";
+import { Container, Row, Col } from "react-bootstrap";
 import GeantLogo from "../../images/geant_logo_f2020_new.svg";
 
 /**
@@ -14,22 +14,23 @@ function ExternalPageNavBar(): ReactElement {
 
             <Container>
                 <Row>
-                    <Col>
-                        <img src={GeantLogo}/>
+                    <nav>
+                        <a href="/"><img src={GeantLogo} /></a>
+
                         <ul>
-                        <li><a href="https://network.geant.org/">NETWORK</a></li>
-                        <li><a href="https://geant.org/services/">SERVICES</a></li>
-                        <li><a href="https://community.geant.org/">COMMUNITY</a></li>
-                        <li><a href="https://tnc23.geant.org/">TNC</a></li>
-                        <li><a href="https://geant.org/projects/">PROJECTS</a></li>
-                        <li><a href="https://connect.geant.org/">CONNECT</a></li>
-                        <li><a href="https://impact.geant.org/">IMPACT</a></li>
-                        <li><a href="https://careers.geant.org/">CAREERS</a></li>
-                        <li><a href="https://about.geant.org/">ABOUT</a></li>
-                        <li><a href="https://connect.geant.org/community-news">NEWS</a></li>
-                        <li><a href="https://resources.geant.org/">RESOURCES</a></li>
+                            <li><a href="https://network.geant.org/">NETWORK</a></li>
+                            <li><a href="https://geant.org/services/">SERVICES</a></li>
+                            <li><a href="https://community.geant.org/">COMMUNITY</a></li>
+                            <li><a href="https://tnc23.geant.org/">TNC</a></li>
+                            <li><a href="https://geant.org/projects/">PROJECTS</a></li>
+                            <li><a href="https://connect.geant.org/">CONNECT</a></li>
+                            <li><a href="https://impact.geant.org/">IMPACT</a></li>
+                            <li><a href="https://careers.geant.org/">CAREERS</a></li>
+                            <li><a href="https://about.geant.org/">ABOUT</a></li>
+                            <li><a href="https://connect.geant.org/community-news">NEWS</a></li>
+                            <li><a href="https://resources.geant.org/">RESOURCES</a></li>
                         </ul>
-                    </Col>
+                    </nav>
                 </Row>
             </Container>
         </div>
diff --git a/webapp/src/scss/layout/_components.scss b/webapp/src/scss/layout/_components.scss
index 7913e9e5..607885d9 100644
--- a/webapp/src/scss/layout/_components.scss
+++ b/webapp/src/scss/layout/_components.scss
@@ -7,7 +7,9 @@
 
 .geant-container {
   max-width: 100vw;
-  height: 100vh;
+  min-height: 95%;
+  height: auto;
+
   padding: 2% 0;
 }
 
@@ -17,10 +19,23 @@
 }
 
 .wordwrap {
-  max-width: 30vw;
+  max-width: 40vw;
   word-wrap: break-word;
 }
 
+
+@media screen and (max-aspect-ratio: 1/1) {
+  .wordwrap {
+    max-width: max(66vw, 66%);
+  }
+}
+
+@media screen and (max-width: 1920px) {
+  .wordwrap {
+    max-width: 50%;
+  }
+}
+
 .center {
   display: flex;
   align-items: center;
@@ -68,4 +83,34 @@
 .collapsible-column {
   flex-basis: 100%;
   padding: 1rem;
+}
+
+@mixin linkHover {
+  &:hover{
+    color: #003753
+  }
+}
+
+.link-text{
+  text-decoration: none;
+  color: #003753;
+  @include linkHover;
+}
+
+.link-text-underline {
+  @extend .link-text;
+}
+
+.link-text-underline:hover {
+  text-decoration: underline;
+}
+
+.page-footer {
+  min-height: 350px;
+  width: 100%;
+  bottom:0;
+  justify-content: center;
+  align-items: center;
+  padding-top: 20px;
+  background-color: #3b536b;
 }
\ No newline at end of file
-- 
GitLab


From 50ce21dc6e6514125b8e3cff1339822841f378bf Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 18 Apr 2023 13:22:18 +0200
Subject: [PATCH 3/5] Support smaller screens better on index and data pages

---
 webapp/src/pages/CompendiumData.tsx | 22 +++++++-------
 webapp/src/pages/Landing.tsx        | 45 +++++++++++++++--------------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/webapp/src/pages/CompendiumData.tsx b/webapp/src/pages/CompendiumData.tsx
index b966c857..44a8cd3f 100644
--- a/webapp/src/pages/CompendiumData.tsx
+++ b/webapp/src/pages/CompendiumData.tsx
@@ -8,39 +8,39 @@ import { Link } from "react-router-dom";
 
 function CompendiumData(): ReactElement {
     return (
-        <main style={{ backgroundColor: "white" }}>
+        <main className="content" style={{ backgroundColor: "white" }}>
             <PageHeader type={'data'} header={'Compendium Data'}>
                 <SectionLink section={"Reports"} />
             </PageHeader>
             <Banner type={'data'}>
-                    <p className="wordwrap">
+                <p className="wordwrap">
                     The GÉANT Compendium provides an authoritative reference source for anyone with an
-                     interest in the development of research and education networking in Europe and beyond.
-                      Published since 2001, the Compendium provides information on key areas such as users, 
-                      services, traffic, budget and staffing.
-                    </p>
+                    interest in the development of research and education networking in Europe and beyond.
+                    Published since 2001, the Compendium provides information on key areas such as users,
+                    services, traffic, budget and staffing.
+                </p>
             </Banner>
-             
+
             <Container className="geant-container">
                 <Row>
                     <div className="center">
-                    
+
                         <CollapsibleBox title="ORGANISATION">
                             <div className="collapsible-column">
                                 <Row>
-                                    <Link to="/analysis" state={{ graph: 'budget' }}>
+                                    <Link to="/analysis" className="link-text-underline" target="_blank">
                                         <span>Budget of NRENs per Year</span>
                                     </Link>
                                 </Row>
 
                                 <Row>
-                                    <Link to="/funding" state={{ graph: 'fundingsources' }}>
+                                    <Link to="/funding" className="link-text-underline" target="_blank">
                                         <span>Income Source of NRENs per Year</span>
                                     </Link>
                                 </Row>
 
                                 <Row>
-                                    <Link to="/charging" state={{ graph: 'charging_structure' }}>
+                                    <Link to="/charging" className="link-text-underline" target="_blank">
                                         <span>Charging Mechanism of NRENs per Year</span>
                                     </Link>
                                 </Row>
diff --git a/webapp/src/pages/Landing.tsx b/webapp/src/pages/Landing.tsx
index 6525abf4..7f9d7955 100644
--- a/webapp/src/pages/Landing.tsx
+++ b/webapp/src/pages/Landing.tsx
@@ -11,16 +11,19 @@ function Landing(): ReactElement {
                 <div className="center-text max-width-100vw">
                     <h1 className="geant-header">THE GÉANT COMPENDIUM OF NRENS</h1>
                     <br />
-                    <p className="wordwrap">
-                    The GÉANT Compendium provides an authoritative reference source for anyone with an
-                     interest in the development of research and education networking in Europe and beyond.
-                      Published since 2001, the Compendium provides information on key areas such as users, 
-                      services, traffic, budget and staffing.
-                    </p>
-                    <p className="wordwrap">
-                    This site captures the responses from the National Research and Education Networks 
-                    themselves. 
-                    </p>
+                    <div className="wordwrap">
+                        <p>
+                            The GÉANT Compendium provides an authoritative reference source for anyone with an
+                            interest in the development of research and education networking in Europe and beyond.
+                            Published since 2001, the Compendium provides information on key areas such as users,
+                            services, traffic, budget and staffing.
+                        </p>
+                        <p>
+                            This site captures the responses from the National Research and Education Networks
+                            themselves.
+                        </p>
+                    </div>
+
                 </div>
             </Row>
             <Row>
@@ -33,7 +36,7 @@ function Landing(): ReactElement {
                             <Col align={"center"}>
 
                                 <Card border='light' style={{ width: "18rem" }}>
-                                    <Link to="/data" style={{textDecoration:"none"}}>
+                                    <Link to="/data" className="link-text" >
                                         <Card.Img src={SectionDataLogo} />
                                         <Card.Body>
                                             <Card.Title>Compendium Data</Card.Title>
@@ -48,16 +51,16 @@ function Landing(): ReactElement {
                             </Col>
                             <Col align={"center"}>
                                 <Card border='light' style={{ width: "18rem" }}>
-                                    <a href="https://resources.geant.org/geant-compendia/" style={{textDecoration:"none"}}>
-                                    <Card.Img src={SectionReportsLogo} />
-                                    <Card.Body>
-                                        <Card.Title>Compendium Reports</Card.Title>
-                                        <Card.Text>
-                                            A GÉANT Compendium Report is published annually, drawing
-                                            on data from the Compendium Survey lled in by NRENs,
-                                            complemented by information from other surveys
-                                        </Card.Text>
-                                    </Card.Body>
+                                    <a href="https://resources.geant.org/geant-compendia/" className="link-text" target="_blank">
+                                        <Card.Img src={SectionReportsLogo} />
+                                        <Card.Body>
+                                            <Card.Title>Compendium Reports</Card.Title>
+                                            <Card.Text>
+                                                A GÉANT Compendium Report is published annually, drawing
+                                                on data from the Compendium Survey lled in by NRENs,
+                                                complemented by information from other surveys
+                                            </Card.Text>
+                                        </Card.Body>
                                     </a>
                                 </Card>
                             </Col>
-- 
GitLab


From 8cece5fa88d9a422f767889321f360b38e8c78eb Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 18 Apr 2023 13:22:27 +0200
Subject: [PATCH 4/5] remove unused component

---
 webapp/src/pages/About.tsx | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 webapp/src/pages/About.tsx

diff --git a/webapp/src/pages/About.tsx b/webapp/src/pages/About.tsx
deleted file mode 100644
index 410aa4a5..00000000
--- a/webapp/src/pages/About.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { ReactElement } from 'react';
-// import AnnualReport from './AnnualReport';
-// import DataAnalysis from './DataAnalysis';
-// import Navigation from './Navigation';
-
-
-// const api_url = window.location.origin+'/';
-
-// console.log(api_url)
-
-function About(): ReactElement {
-
-  return (
-
-    <div>
-      <h1>About Page</h1>
-    </div>
-  );
-}
-
-export default About;
-- 
GitLab


From 7a6ff51bdcc4fde0e23cfdaa2649ecd1b2be75e9 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 18 Apr 2023 13:22:37 +0200
Subject: [PATCH 5/5] add EU logo and a colored GEANT logo

---
 webapp/src/images/eu_logo.png            | Bin 0 -> 9089 bytes
 webapp/src/images/geant_logo_colored.svg |  40 +++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 webapp/src/images/eu_logo.png
 create mode 100644 webapp/src/images/geant_logo_colored.svg

diff --git a/webapp/src/images/eu_logo.png b/webapp/src/images/eu_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe13dc7afb560eaafda8498d75c3102869833e84
GIT binary patch
literal 9089
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

literal 0
HcmV?d00001

diff --git a/webapp/src/images/geant_logo_colored.svg b/webapp/src/images/geant_logo_colored.svg
new file mode 100644
index 00000000..fe20f727
--- /dev/null
+++ b/webapp/src/images/geant_logo_colored.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, 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 140 61" style="enable-background:new 0 0 140 61;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#E5004B;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M28.9,31.6c1-0.8,1.9-1.2,2.7-1.2c1.7,0.1,2.2,1.2,2.3,1.9c-0.4,0.1-7.8,2.6-8.2,2.7
+				c-0.1-0.1-0.2-0.3-0.4-0.4C25.8,34.4,28.9,31.6,28.9,31.6z"/>
+			<path class="st0" d="M1.5,47.5c0,8.4,3.7,12.7,11,12.7c4.8,0,7.7-2.1,7.8-2.2l0.2-0.2V46.2H10.5v3.2c0,0,5,0,6,0c0,0.9,0,6,0,6.5
+				c-0.6,0.3-2.1,1-4.2,1c-4.3,0-6.4-3.1-6.4-9.4c0-3.6,1-8,6-8c3.3,0,4.4,1.9,4.4,3.7v0.6h4.5v-0.6c0-4.1-3.6-6.9-8.9-6.9
+				C5.2,36.3,1.5,40.4,1.5,47.5z"/>
+			<path class="st0" d="M36.4,36.7H23.2v23.1h14.1v-3.2c0,0-9,0-10,0c0-0.9,0-6.3,0-7.3c1,0,9.2,0,9.2,0v-3.2c0,0-8.2,0-9.2,0
+				c0-0.9,0-5.3,0-6.2c1,0,9.7,0,9.7,0v-3.2H36.4z"/>
+			<g>
+				<path class="st0" d="M95.8,36.7h-20c0,0,0,13.9,0,17.1c-1.6-2.8-9.9-17.1-9.9-17.1h-4.7v23.1h3.9c0,0,0-13.9,0-17.1
+					c1.6,2.8,9.9,17.1,9.9,17.1h4.7c0,0,0-18.8,0-19.9c0.9,0,5.5,0,6.4,0c0,1.1,0,19.9,0,19.9h4.1c0,0,0-18.8,0-19.9
+					c0.9,0,6.2,0,6.2,0v-3.2H95.8z"/>
+			</g>
+			<path class="st0" d="M51.5,36.7h-0.4h-4l-8.7,23.1h4.2c0,0,2.3-6.1,2.5-6.8c0.7,0,7.8,0,8.5,0c0.3,0.7,2.6,6.8,2.6,6.8h4.2
+				L51.5,36.7z M46.3,49.8c0.4-1.1,2.3-6.7,3-8.7c0.7,2,2.6,7.5,3,8.7C51.2,49.8,47.4,49.8,46.3,49.8z"/>
+		</g>
+		<g>
+			<path class="st0" d="M134.7,14.7c-15.2-18.8-76.9,7.8-93.4,14.8c-1.2,0.5-2.7,0.4-3.6-1.3c0.7,1.7,2,2.3,3.7,1.7
+				c22-8.8,75.2-27.9,88.5-10.5c6,7.9,4.3,17.6-2.3,31.3c-0.3,0.6-0.5,1-0.6,1.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1
+				c-0.5,0.8-1.2,1.3-1.8,1.5c0.8,0,1.6-0.4,2.2-1.4c0.2-0.3,0.4-0.6,0.6-1l0,0C137.7,34.7,141.1,22.5,134.7,14.7z"/>
+		</g>
+		<g>
+			<path class="st1" d="M123.2,52.6c-0.2-0.2-3-2.6-5.7-5.2C103,33.8,59.4-8.4,40.3,2.7c-5.4,3.1-6.3,12.2-3,24.3c0,0,0,0,0,0.1v0
+				c0,0.2,0.1,0.3,0.1,0.5c0.4,1.3,1.3,2.1,2.4,2.1c-0.8-0.2-1.5-0.8-1.9-1.8c-0.1-0.1-0.1-0.3-0.1-0.4c-0.1-0.2-0.1-0.4-0.2-0.7
+				l0,0c0-0.1-0.1-0.3-0.1-0.4c-1.8-10.3,0.4-17,4.5-19.8c15.3-10,52,21.6,70.4,37.5c4.2,3.7,9,7.7,10.5,8.8c2.1,1.6,3.8-0.2,4.3-1
+				C126.6,53,124.8,54,123.2,52.6z"/>
+		</g>
+	</g>
+</g>
+</svg>
-- 
GitLab