aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-09-06 09:47:55 +0200
committerChocobozzz <me@florianbigard.com>2019-09-06 09:47:55 +0200
commit8d5e65349deebd499c0be10fe02d535a77d58ddb (patch)
tree299bc6adb6d7990bdffdc8b31d54a44b36c84067
parent5faed166535b34bde56bda7c123654cf655a0541 (diff)
parent606793b917412de56f67bddd829bffee46868980 (diff)
downloadPeerTube-8d5e65349deebd499c0be10fe02d535a77d58ddb.tar.gz
PeerTube-8d5e65349deebd499c0be10fe02d535a77d58ddb.tar.zst
PeerTube-8d5e65349deebd499c0be10fe02d535a77d58ddb.zip
Merge branch 'release/1.4.0' into develop
-rw-r--r--client/src/app/menu/menu.component.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 76e73155c..15eaa1434 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -16,7 +16,8 @@ menu {
16 margin: 0; 16 margin: 0;
17 padding: 0; 17 padding: 0;
18 height: 100%; 18 height: 100%;
19 overflow: auto; 19 overflow-x: hidden;
20 overflow-y: auto;
20 color: var(--menuForegroundColor); 21 color: var(--menuForegroundColor);
21 display: flex; 22 display: flex;
22 flex-direction: column; 23 flex-direction: column;