Merge remote-tracking branch 'upstream/develop' into account-menu-splitted

# Conflicts: # app/assets/javascripts/directives/views/accountMenu.ts
2021-06-17 13:37:16 +04:00
parent a76213dd1f 184ce19ad7
commit 374e9c0616
12 changed files with 33 additions and 45 deletions
--- a/app/assets/stylesheets/_main.scss
+++ b/app/assets/stylesheets/_main.scss
@@ -136,7 +136,7 @@ $footer-height: 32px;
    top: 0;
    right: 0;
    z-index: $z-index-panel-resizer;
-    width: 8px;
+    width: 2px;
    height: 100%;
    position: absolute;
    cursor: col-resize;