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

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dashboard-ui/devices/android/android.css
View file

@ -1,17 +1,13 @@
.viewMenuBar, .libraryViewNav:not(.paperLibraryViewNav), paper-tabs {
background-color: #101010;
background-color: #080808;
}
.viewMenuBar.semiTransparent {
background-color: rgba(15, 15, 15, .45);
background-color: rgba(15, 15, 15, .3);
}
.background-theme-b, paper-dialog.background-theme-b {
background: #202020;
}
.backdropContainer .pageBackground {
background-color: rgba(20, 20,20, .94) !important;
background-color: #1b1b1b;
}
.defaultBackground .cardImage {

6
dashboard-ui/devices/ie/ie.css
View file

@ -1,7 +1,3 @@
paper-icon-button {
height: 24px;
}
paper-fab.keyboard-focus.paper-fab-0 {
paper-fab.keyboard-focus.paper-fab-0 {
background: #444;
}

43
dashboard-ui/devices/ie/ie.js
View file

@ -1,19 +1,29 @@
(function () {
Dashboard.importCss('devices/ie/ie.css');
require(['css!devices/ie/ie.css']);
var browserSwitchKey = "ieswitchbrowser";
function getWeek(date) {
var onejan = new Date(date.getFullYear(), 0, 1);
return Math.ceil((((date - onejan) / 86400000) + onejan.getDay() + 1) / 7);
}
function onPageShow() {
var page = this;
var expectedValue;
var msg;
if (navigator.userAgent.toLowerCase().indexOf('windows nt 10.') != -1) {
var expectedValue = new Date().toDateString() + "1";
if (appStorage.getItem("ieswitchtoedge") == expectedValue) {
expectedValue = new Date().toDateString() + "1";
if (appStorage.getItem(browserSwitchKey) == expectedValue) {
return;
}
var msg = Globalize.translate('MessageTryMicrosoftEdge');
msg = Globalize.translate('MessageTryMicrosoftEdge');
msg += "<br/><br/>";
msg += '<a href="https://www.microsoft.com/en-us/windows/microsoft-edge" target="_blank">' + Globalize.translate('ButtonLearnMore') + '</a>';
@ -23,10 +33,31 @@
title: Globalize.translate('HeaderTryMicrosoftEdge')
});
appStorage.setItem("ieswitchtoedge", expectedValue);
} else {
expectedValue = getWeek(new Date()) + "_7";
if (appStorage.getItem(browserSwitchKey) == expectedValue) {
return;
}
if (!appStorage.getItem(browserSwitchKey)) {
appStorage.setItem(browserSwitchKey, expectedValue);
return;
}
msg = Globalize.translate('MessageTryModernBrowser');
msg += "<br/><br/>";
msg += '<a href="https://www.google.com/chrome" target="_blank">' + Globalize.translate('ButtonLearnMore') + '</a>';
Dashboard.alert({
message: msg,
title: Globalize.translate('HeaderTryModernBrowser')
});
}
appStorage.setItem(browserSwitchKey, expectedValue);
}
pageClassOn('pageshow', "libraryPage", onPageShow);

6
dashboard-ui/devices/ios/ios.css
View file

@ -86,11 +86,15 @@ body {
flex-grow: 0 !important;
}
.ui-body-b .paperList {
.ui-body-b .paperList:not(.criticReviewPaperList) {
background-color: transparent;
box-shadow: none;
}
.criticReviewPaperList {
background-color: #262626;
}
.settingsMenuHeader {
display: none;
}