1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fixed user image scaling

This commit is contained in:
Luke Pulverenti 2014-05-02 10:49:28 -04:00
parent d5780727eb
commit 5218e67d4e
12 changed files with 59 additions and 24 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -116,7 +116,7 @@
.listHeader { .listHeader {
margin-top: .5em; margin-top: .5em;
margin-bottom: .25em; margin-bottom: .2em;
padding-left: 7px; padding-left: 7px;
} }

View file

@ -338,11 +338,11 @@
@media all and (min-width: 1440px) { @media all and (min-width: 1440px) {
.squarePosterItem { .squarePosterItem {
width: 180px; width: 167px;
} }
.squarePosterItem .posterItemImage { .squarePosterItem .posterItemImage {
height: 180px; height: 167px;
} }
.backdropPosterItem { .backdropPosterItem {

View file

@ -26,6 +26,31 @@
src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(fonts/OpenSans-ExtraBold.woff) format('woff'); src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(fonts/OpenSans-ExtraBold.woff) format('woff');
} }
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 100;
src: local('Roboto Thin'), local('Roboto-Thin'), url(fonts/RobotoThin.woff) format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: local('Roboto Light'), local('Roboto-Light'), url(fonts/RobotoLight.woff) format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto Regular'), local('Roboto-Regular'), url(fonts/RobotoRegular.woff) format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: local('Roboto Medium'), local('Roboto-Medium'), url(fonts/RobotoMedium.woff) format('woff');
}
* { * {
text-shadow: none!important; text-shadow: none!important;
} }
@ -45,8 +70,9 @@ body {
} }
h1 { h1 {
font-weight: 300; font-weight: 100;
font-size: 2em; font-size: 28px;
font-family: Roboto;
} }
.ui-loader h1 { .ui-loader h1 {

View file

@ -132,11 +132,14 @@
<input class="chkFeatureFilter" type="checkbox" name="chkSubtitle" id="chkSubtitle" data-mini="true"> <input class="chkFeatureFilter" type="checkbox" name="chkSubtitle" id="chkSubtitle" data-mini="true">
<label for="chkSubtitle">${OptionHasSubtitles}</label> <label for="chkSubtitle">${OptionHasSubtitles}</label>
<input class="chkFeatureFilter" type="checkbox" name="chkNoSubtitle" id="chkNoSubtitle" data-mini="true">
<label for="chkNoSubtitle">${OptionNoSubtitles}</label>
<input class="chkFeatureFilter" type="checkbox" name="chkTrailer" id="chkTrailer" data-mini="true"> <input class="chkFeatureFilter" type="checkbox" name="chkTrailer" id="chkTrailer" data-mini="true">
<label for="chkTrailer">${OptionHasTrailer}</label> <label for="chkTrailer">${OptionHasTrailer}</label>
<input class="chkFeatureFilter" type="checkbox" name="chkSpecialFeature" id="chkSpecialFeature" data-mini="true"> <input class="chkFeatureFilter" type="checkbox" name="chkSpecialFeature" id="chkSpecialFeature" data-mini="true">
<label for="chkSpecialFeature">Special features</label> <label for="chkSpecialFeature">${OptionSpecialFeatures}</label>
<input class="chkFeatureFilter" type="checkbox" name="chkThemeSong" id="chkThemeSong" data-mini="true"> <input class="chkFeatureFilter" type="checkbox" name="chkThemeSong" id="chkThemeSong" data-mini="true">
<label for="chkThemeSong">${OptionHasThemeSong}</label> <label for="chkThemeSong">${OptionHasThemeSong}</label>

View file

@ -68,19 +68,11 @@
function getItemHref(item) { function getItemHref(item) {
if (item.Type == 'ManualCollectionsFolder') { if (item.Type == 'ManualCollectionsFolder' || item.CollectionType == 'boxsets') {
return 'collections.html?topParentId=' + item.Id; return 'collections.html?topParentId=' + item.Id;
} }
if (item.CollectionType == 'boxsets') { if (item.CollectionType == 'trailers' || item.Type == 'TrailerCollectionFolder') {
return 'moviecollections.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'trailers') {
return 'movietrailers.html?topParentId=' + item.Id;
}
if (item.Type == 'TrailerCollectionFolder') {
return 'movietrailers.html?topParentId=' + item.Id; return 'movietrailers.html?topParentId=' + item.Id;
} }

View file

@ -600,6 +600,7 @@
$('#chkSD', page).checked(query.IsHD == false).checkboxradio('refresh'); $('#chkSD', page).checked(query.IsHD == false).checkboxradio('refresh');
$('#chkSubtitle', page).checked(query.HasSubtitles == true).checkboxradio('refresh'); $('#chkSubtitle', page).checked(query.HasSubtitles == true).checkboxradio('refresh');
$('#chkNoSubtitle', page).checked(query.HasSubtitles === false).checkboxradio('refresh');
$('#chkTrailer', page).checked(query.HasTrailer == true).checkboxradio('refresh'); $('#chkTrailer', page).checked(query.HasTrailer == true).checkboxradio('refresh');
$('#chkSpecialFeature', page).checked(query.HasSpecialFeature == true).checkboxradio('refresh'); $('#chkSpecialFeature', page).checked(query.HasSpecialFeature == true).checkboxradio('refresh');
$('#chkThemeSong', page).checked(query.HasThemeSong == true).checkboxradio('refresh'); $('#chkThemeSong', page).checked(query.HasThemeSong == true).checkboxradio('refresh');
@ -712,6 +713,18 @@
query.StartIndex = 0; query.StartIndex = 0;
query.HasSubtitles = this.checked ? true : null; query.HasSubtitles = this.checked ? true : null;
$('#chkNoSubtitle', page).checked(false).checkboxradio('refresh');
reloadItems(page);
});
$('#chkNoSubtitle', page).on('change', function () {
query.StartIndex = 0;
query.HasSubtitles = this.checked ? false : null;
$('#chkSubtitle', page).checked(false).checkboxradio('refresh');
reloadItems(page); reloadItems(page);
}); });

View file

@ -13,7 +13,7 @@
SortBy: "DateCreated", SortBy: "DateCreated",
SortOrder: "Descending", SortOrder: "Descending",
IncludeItemTypes: "MusicAlbum", IncludeItemTypes: "MusicAlbum",
Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 5), Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 5),
Recursive: true, Recursive: true,
Fields: "PrimaryImageAspectRatio", Fields: "PrimaryImageAspectRatio",
ParentId: parentId ParentId: parentId
@ -36,7 +36,7 @@
SortBy: "DateCreated", SortBy: "DateCreated",
SortOrder: "Descending", SortOrder: "Descending",
IncludeItemTypes: "Audio", IncludeItemTypes: "Audio",
Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 5), Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 5),
Recursive: true, Recursive: true,
Fields: "PrimaryImageAspectRatio,AudioInfo", Fields: "PrimaryImageAspectRatio,AudioInfo",
ParentId: parentId ParentId: parentId
@ -59,7 +59,7 @@
SortBy: "DatePlayed", SortBy: "DatePlayed",
SortOrder: "Descending", SortOrder: "Descending",
IncludeItemTypes: "Audio", IncludeItemTypes: "Audio",
Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 5), Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 5),
Recursive: true, Recursive: true,
Fields: "PrimaryImageAspectRatio,AudioInfo", Fields: "PrimaryImageAspectRatio,AudioInfo",
Filters: "IsPlayed", Filters: "IsPlayed",
@ -89,7 +89,7 @@
SortBy: "PlayCount", SortBy: "PlayCount",
SortOrder: "Descending", SortOrder: "Descending",
IncludeItemTypes: "Audio", IncludeItemTypes: "Audio",
Limit: screenWidth >= 1920 ? 12 : (screenWidth >= 1440 ? 12 : 10), Limit: screenWidth >= 1920 ? 14 : (screenWidth >= 1440 ? 14 : 10),
Recursive: true, Recursive: true,
Fields: "PrimaryImageAspectRatio,AudioInfo", Fields: "PrimaryImageAspectRatio,AudioInfo",
Filters: "IsPlayed", Filters: "IsPlayed",

View file

@ -2041,16 +2041,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
if (ratio) { if (ratio) {
if (options.width) { if (options.width) {
options.width = options.width * ratio;
options.width = Math.round(options.width * ratio);
} }
if (options.height) { if (options.height) {
options.height = options.height * ratio; options.height = Math.round(options.height * ratio);
} }
if (options.maxWidth) { if (options.maxWidth) {
options.maxWidth = options.maxWidth * ratio; options.maxWidth = Math.round(options.maxWidth * ratio);
} }
if (options.maxHeight) { if (options.maxHeight) {
options.maxHeight = options.maxHeight * ratio; options.maxHeight = Math.round(options.maxHeight * ratio);
} }
} }