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

Merge remote-tracking branch 'upstream/master' into es6

Browse source 
With conflicts
This commit is contained in:
MrTimscampi 2020-07-24 10:23:14 +02:00
commit 3713091382
165 changed files with 4194 additions and 2714 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/elements/emby-scrollbuttons/emby-scrollbuttons.css
View file

@ -6,7 +6,7 @@
justify-content: center;
min-width: 104px;
min-height: 24px;
padding-top: 1.25em;
padding-top: 0.85em;
z-index: 1;
color: #fff;
display: flex;

5
src/elements/emby-scrollbuttons/emby-scrollbuttons.js
View file

@ -1,8 +1,13 @@
<<<<<<< HEAD
import layoutManager from 'layoutManager';
import dom from 'dom';
import 'css!./emby-scrollbuttons';
import 'registerElement';
import 'paper-icon-button-light';
=======
define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'webcomponents', 'paper-icon-button-light'], function (layoutManager, dom) {
'use strict';
>>>>>>> upstream/master
/* eslint-disable indent */