From 1dbad341b986197c9dcb26e50f808458d43d8e08 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Wed, 26 Dec 2018 18:58:13 +0100
Subject: [PATCH] Fixed channel description overflow

---
 .travis.yml                             | 2 +-
 shared/html/templates.html              | 2 +-
 shared/js/ui/frames/SelectedItemInfo.ts | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 93160a88..2f3101de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ jobs:
       - docker images
       - docker pull $DOCKER_USERNAME/teaweb:build
       - docker images
-      - "docker run --rm $DOCKER_USERNAME/teaweb:build /bin/bash -c \"/root/build_teaweb.sh travis\""
+      - "docker run --rm $DOCKER_USERNAME/teaweb:build /bin/bash -c \"export GIT_AUTHTOKEN=\"$GIT_AUTHTOKEN\"; /root/build_teaweb.sh travis\""
       if: branch = master
     - stage: test teaweb build
       script:
diff --git a/shared/html/templates.html b/shared/html/templates.html
index 364ab5d7..1854e1f4 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -1672,7 +1672,7 @@
                     </td>
                 </tr>
             </table>
-            <div style="margin-top: 10px">
+            <div style="margin-top: 10px; flex-shrink: 1; flex-direction: column; display: flex; flex-grow: 1;">
                 <b style="margin-bottom: 2px">{{tr "Description"/}}</b>
                 <node key="bbcode_channel_description"></node>
             </div>
diff --git a/shared/js/ui/frames/SelectedItemInfo.ts b/shared/js/ui/frames/SelectedItemInfo.ts
index a4d913b7..3526f032 100644
--- a/shared/js/ui/frames/SelectedItemInfo.ts
+++ b/shared/js/ui/frames/SelectedItemInfo.ts
@@ -324,7 +324,9 @@ class ChannelInfoManager extends InfoManager<ChannelEntry> {
                 console.log("BBCode parse error: %o", result.errorQueue);
             }
 
-            tag_channel_description.html(result.html);
+            tag_channel_description.html(result.html)
+                .css("overflow-y", "auto")
+                .css("flex-grow", "1");
         });
 
         let rendered = $("#tmpl_selected_channel").renderTag([properties]);