Fixed channel description overflow

canary
WolverinDEV 2018-12-26 18:58:13 +01:00
parent ab6efaa371
commit 1dbad341b9
3 changed files with 5 additions and 3 deletions

View File

@ -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:

View File

@ -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>

View File

@ -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]);