milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
ferferga 2020-05-16 18:07:32 +02:00
parent dd80697e61
commit 6a596bd497
10 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/list.html
View file

@ -42,10 +42,10 @@
<span class="material-icons filter_list"></span>
</button>
<button is="emby-button" class="btnViewSettings button-flat listTextButton-autohide">
<span class="material-icons more_horiz"></span>
<span class="material-icons more_vert"></span>
</button>
<button is="paper-icon-button-light" class="btnViewSettings listIconButton-autohide">
<span class="material-icons more_horiz"></span>
<span class="material-icons more_vert"></span>
</button>
</div>
<div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered" style="padding: 0 0 10vh 0;">