From 0082906daf2c3bddef9bfefcfa7a0fbf3359686e Mon Sep 17 00:00:00 2001
From: Katherina Marcenko <45818654+KatvonRivia@users.noreply.github.com>
Date: Thu, 15 Oct 2020 18:01:56 +0200
Subject: [PATCH] New Version 0.10.0 (#693)

* refactor(scrollbar): set overflow to scroll to avoid weird padding (#681)

* refactor(scrollbar): set overflow to scroll to avoid weird padding

* refactor(scrollbars): add scrollbar width for firefox

* fix(spinning-globe): stop spinning when layer is selected or projection changes (#683)

* fix(text-select): fix text select when moving globe (#685)

* feat(tracking): init matomo

* refactor(story-selector): hide tags on presentation modes (#687)

* refactor(credits): adjust credits, move links to config (#689)

* refactor(credits): adjust credits, move links to config

* refactor(menu): adjust spacing

* feat(tracking): implement tracking and consent

* refactor(tracking): cleanup

* fix(timeslider): show single slider when there is no main range (#691)

* 0.10.0 (#692)

Co-authored-by: Malte Modrow <modrow@ubilabs.net>
---
 src/scripts/components/main/menu/menu.styl | 3 +++
 src/scripts/components/main/menu/menu.tsx  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/scripts/components/main/menu/menu.styl b/src/scripts/components/main/menu/menu.styl
index bfc44c53e..d721ee393 100644
--- a/src/scripts/components/main/menu/menu.styl
+++ b/src/scripts/components/main/menu/menu.styl
@@ -85,7 +85,10 @@
 
 .logo
   padding: emCalc(10px) emCalc(22px)
+<<<<<<< HEAD
   background-color: $black
+=======
+>>>>>>> New Version 0.10.0 (#693)
 
   img
     width: emCalc(80px)
diff --git a/src/scripts/components/main/menu/menu.tsx b/src/scripts/components/main/menu/menu.tsx
index a6fb2b2b5..ab9400563 100644
--- a/src/scripts/components/main/menu/menu.tsx
+++ b/src/scripts/components/main/menu/menu.tsx
@@ -166,6 +166,12 @@ const Menu: FunctionComponent = () => {
               <li className={styles.menuListItem}>
                 <TrackingToggle />
               </li>
+              <li className={styles.subMenuTitle}>
+                <AnalyticsIcon /> <FormattedMessage id={'analytics'} />
+              </li>
+              <li className={styles.menuListItem}>
+                <TrackingToggle />
+              </li>
             </ul>
           </React.Fragment>
         )}