Skip to content

Commit

Permalink
New Version 0.10.0 (#693)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
KatvonRivia and mrMetalWood committed Apr 28, 2021
1 parent 425faa3 commit 0082906
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/scripts/components/main/menu/menu.styl
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@

.logo
padding: emCalc(10px) emCalc(22px)
<<<<<<< HEAD
background-color: $black
=======
>>>>>>> New Version 0.10.0 (#693)

img
width: emCalc(80px)
Expand Down
6 changes: 6 additions & 0 deletions src/scripts/components/main/menu/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)}
Expand Down

0 comments on commit 0082906

Please sign in to comment.