Merge branch 'develop' into better-menu-rework

diff --cc scss/_global.scss
Simple merge

diff --cc scss/components/_menu.scss
index e0c9ea6c2797c9e138d95b2c531c54e9b6ef2b6c,8629cf20d020435ecf1fdafc5b2f87da80df5eca..44089574cba60bca6a117b9149441c175451cb9c
--- 1/scss/components/_menu.scss
--- 2/scss/components/_menu.scss
+++ b/scss/components/_menu.scss
@@@ -296,9 -244,7 +296,7 @@@ $menu-item-background-hover: $light-gra
  }
  
  @mixin menu-text {
 -  padding: $menu-item-padding;
 +  padding: $global-menu-padding;
-   padding-top: 0;
-   padding-bottom: 0;
  
    font-weight: bold;
    line-height: 1;