Merge pull request #173 from vexorian/20201017_dev

Fix #164 : Filler List getting compressed in Webkit (Safari)
This commit is contained in:
vexorian 2020-10-17 12:36:04 -04:00 committed by GitHub
commit 59aa843fb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# dizqueTV 1.1.1-prerelease
# dizqueTV 1.1.3-prerelease
![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/vexorian/dizquetv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/vexorian/dizquetv?logo=docker&logoColor=fff&style=flat-square)
Create live TV channel streams from media on your Plex servers.

View File

@ -5,5 +5,5 @@ module.exports = {
TVGUIDE_MAXIMUM_FLEX_DURATION : 6 * 60 * 60 * 1000,
TOO_FREQUENT: 100,
VERSION_NAME: "1.1.1-prerelease"
VERSION_NAME: "1.1.3-prerelease"
}

View File

@ -249,6 +249,17 @@ table.tvguide {
text-align: right;
}
.filler-list .list-group-item {
min-height: 1.5em;
}
.filler-list .list-group-item .title {
margin-right: 5px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/* Safari */
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }

View File

@ -63,13 +63,14 @@
</div>
<div class="modal-body container list-group list-group-root" vs-repeat="options" dnd-list="content" ng-if="showList()">
<!--div class="modal-body container list-group list-group-root" vs-repeat="options" dnd-list="content" ng-if="showList()"-->
<div class="modal-body container list-group list-group-root filler-list" dnd-list="content" ng-if="showList()" >
<div class="list-group-item flex-container" style="cursor: default;" ng-repeat="x in content" dnd-draggable="x" dnd-moved="content.splice($index, 1)" dnd-effect-allowed="move">
<div class="program-start" >
{{durationString(x.duration)}}
</div>
<div ng-style="programSquareStyle(x, false)" />
<div style="margin-right: 5px;">
<div class="title" >
{{x.title}}
</div>
<div class="flex-pull-right">