Merge branch '649-items-in-sidenav-do-not-yield-to-uploaded-logo' into 'master'

Resolve "Items in sidenav do not yield to uploaded logo"

Closes #649

See merge request !1020

CHANGELOG.rst

@@ -26,6 +26,7 @@ Fixed
 * Due to a merge error, the once removed account menu in the sidenav appeared again.
 * Scheduled notifications were shown on dashboard before time.
 * Remove broken notifications menu item in favor of item next to account menu.
+* The site logo could overlap with the menu for logos with an unexpected aspect ratio.
 
 Changed
 ~~~~~~~

aleksis/core/static/public/style.scss

@@ -115,17 +115,15 @@ main {
 /* SIDENAV */
 /***********/
 
-ul.sidenav.sidenav-fixed li.logo {
-  margin-top: 32px;
-  margin-bottom: 50px;
-}
-
 ul.sidenav.sidenav-fixed .brand-logo {
   margin: 0;
+  height: 100%;
 }
 
 .logo img {
-  width: 250px;
+  width: 268px;
+  margin-block: 1em;
+  vertical-align: middle;
 }
 
 .sidenav a:not(.collapsible-header) {