From: Chocobozzz <me@florianbigard.com>
Date: Wed, 15 May 2019 13:32:25 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: v1.3.0-rc.2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=oweals%2Fpeertube.git

Merge branch 'master' into develop
---

97567dd81f508dd6295ac4d73d849aa2ce0a6549
diff --cc client/src/app/menu/menu.component.scss
index fa9a006af,69704674a..2f23fa5f8
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@@ -47,12 -37,13 +47,15 @@@ menu 
      display: flex;
      align-items: center;
      justify-content: center;
 -    margin-bottom: 35px;
 +    margin-bottom: 20px;
  
      .logged-in-info {
 +      @include ellipsis;
 +
        flex-grow: 1;
+       white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
  
        .logged-in-display-name {
          font-size: 16px;