mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix left margin on item details poster
This commit is contained in:
parent
bff5918c85
commit
9489ad7134
2 changed files with 2 additions and 21 deletions
|
@ -2,11 +2,8 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
function getDefaultProfile() {
|
function getDefaultProfile() {
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise(function (resolve, reject) {
|
||||||
|
|
||||||
require(['browserdeviceprofile'], function (profileBuilder) {
|
require(['browserdeviceprofile'], function (profileBuilder) {
|
||||||
|
|
||||||
resolve(profileBuilder({}));
|
resolve(profileBuilder({}));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -14,28 +11,22 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
|
|
||||||
var fadeTimeout;
|
var fadeTimeout;
|
||||||
function fade(instance, elem, startingVolume) {
|
function fade(instance, elem, startingVolume) {
|
||||||
|
|
||||||
instance._isFadingOut = true;
|
instance._isFadingOut = true;
|
||||||
|
|
||||||
// Need to record the starting volume on each pass rather than querying elem.volume
|
// Need to record the starting volume on each pass rather than querying elem.volume
|
||||||
// This is due to iOS safari not allowing volume changes and always returning the system volume value
|
// This is due to iOS safari not allowing volume changes and always returning the system volume value
|
||||||
|
|
||||||
var newVolume = Math.max(0, startingVolume - 0.15);
|
var newVolume = Math.max(0, startingVolume - 0.15);
|
||||||
console.log('fading volume to ' + newVolume);
|
console.log('fading volume to ' + newVolume);
|
||||||
elem.volume = newVolume;
|
elem.volume = newVolume;
|
||||||
|
|
||||||
if (newVolume <= 0) {
|
if (newVolume <= 0) {
|
||||||
|
|
||||||
instance._isFadingOut = false;
|
instance._isFadingOut = false;
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise(function (resolve, reject) {
|
||||||
|
|
||||||
cancelFadeTimeout();
|
cancelFadeTimeout();
|
||||||
|
|
||||||
fadeTimeout = setTimeout(function () {
|
fadeTimeout = setTimeout(function () {
|
||||||
|
|
||||||
fade(instance, elem, newVolume).then(resolve, reject);
|
fade(instance, elem, newVolume).then(resolve, reject);
|
||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
|
@ -50,7 +41,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
}
|
}
|
||||||
|
|
||||||
function supportsFade() {
|
function supportsFade() {
|
||||||
|
|
||||||
if (browser.tv) {
|
if (browser.tv) {
|
||||||
// Not working on tizen.
|
// Not working on tizen.
|
||||||
// We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
|
// We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
|
||||||
|
@ -68,9 +58,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
}
|
}
|
||||||
|
|
||||||
function enableHlsPlayer(url, item, mediaSource, mediaType) {
|
function enableHlsPlayer(url, item, mediaSource, mediaType) {
|
||||||
|
|
||||||
if (!htmlMediaHelper.enableHlsJsPlayer(mediaSource.RunTimeTicks, mediaType)) {
|
if (!htmlMediaHelper.enableHlsJsPlayer(mediaSource.RunTimeTicks, mediaType)) {
|
||||||
|
|
||||||
return Promise.reject();
|
return Promise.reject();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,21 +74,18 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
url: url,
|
url: url,
|
||||||
type: 'HEAD'
|
type: 'HEAD'
|
||||||
}).then(function (response) {
|
}).then(function (response) {
|
||||||
|
|
||||||
var contentType = (response.headers.get('Content-Type') || '').toLowerCase();
|
var contentType = (response.headers.get('Content-Type') || '').toLowerCase();
|
||||||
if (contentType === 'application/x-mpegurl') {
|
if (contentType === 'application/x-mpegurl') {
|
||||||
resolve();
|
resolve();
|
||||||
} else {
|
} else {
|
||||||
reject();
|
reject();
|
||||||
}
|
}
|
||||||
|
|
||||||
}, reject);
|
}, reject);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function HtmlAudioPlayer() {
|
function HtmlAudioPlayer() {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
self.name = 'Html Audio Player';
|
self.name = 'Html Audio Player';
|
||||||
|
@ -114,11 +99,9 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
|
|
||||||
self._started = false;
|
self._started = false;
|
||||||
self._timeUpdated = false;
|
self._timeUpdated = false;
|
||||||
|
|
||||||
self._currentTime = null;
|
self._currentTime = null;
|
||||||
|
|
||||||
var elem = createMediaElement(options);
|
var elem = createMediaElement(options);
|
||||||
|
|
||||||
return setCurrentSrc(elem, options);
|
return setCurrentSrc(elem, options);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -449,11 +449,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.detailImageContainer {
|
.detailImageContainer {
|
||||||
margin-right: 2em;
|
|
||||||
width: 280px;
|
width: 280px;
|
||||||
-webkit-flex-shrink: 0;
|
margin-right: 2em;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
margin-left: .6em
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.detailPagePrimaryContent {
|
.detailPagePrimaryContent {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue