From 34c0d6019e9990137f8713f62bcba29ec2157539 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 15 Dec 2019 20:47:47 +0900 Subject: [PATCH 01/70] move around half the dashboard controllers to a subdirectory --- .../dashboard.js} | 0 .../general.js} | 0 .../{logpage.js => dashboard/logs.js} | 0 src/controllers/{ => dashboard}/networking.js | 0 .../notifications/notification.js} | 0 .../notifications/notifications.js} | 0 .../plugins/add.js} | 0 .../plugins/available.js} | 0 .../plugins/installed.js} | 0 .../scheduledtasks/scheduledtask.js} | 0 .../scheduledtasks/scheduledtasks.js} | 0 src/scripts/routes.js | 133 +++++++++--------- 12 files changed, 64 insertions(+), 69 deletions(-) rename src/controllers/{dashboardpage.js => dashboard/dashboard.js} (100%) rename src/controllers/{dashboardgeneral.js => dashboard/general.js} (100%) rename src/controllers/{logpage.js => dashboard/logs.js} (100%) rename src/controllers/{ => dashboard}/networking.js (100%) rename src/controllers/{notificationsetting.js => dashboard/notifications/notification.js} (100%) rename src/controllers/{notificationsettings.js => dashboard/notifications/notifications.js} (100%) rename src/controllers/{addpluginpage.js => dashboard/plugins/add.js} (100%) rename src/controllers/{availableplugins.js => dashboard/plugins/available.js} (100%) rename src/controllers/{installedplugins.js => dashboard/plugins/installed.js} (100%) rename src/controllers/{scheduledtaskpage.js => dashboard/scheduledtasks/scheduledtask.js} (100%) rename src/controllers/{scheduledtaskspage.js => dashboard/scheduledtasks/scheduledtasks.js} (100%) diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboard/dashboard.js similarity index 100% rename from src/controllers/dashboardpage.js rename to src/controllers/dashboard/dashboard.js diff --git a/src/controllers/dashboardgeneral.js b/src/controllers/dashboard/general.js similarity index 100% rename from src/controllers/dashboardgeneral.js rename to src/controllers/dashboard/general.js diff --git a/src/controllers/logpage.js b/src/controllers/dashboard/logs.js similarity index 100% rename from src/controllers/logpage.js rename to src/controllers/dashboard/logs.js diff --git a/src/controllers/networking.js b/src/controllers/dashboard/networking.js similarity index 100% rename from src/controllers/networking.js rename to src/controllers/dashboard/networking.js diff --git a/src/controllers/notificationsetting.js b/src/controllers/dashboard/notifications/notification.js similarity index 100% rename from src/controllers/notificationsetting.js rename to src/controllers/dashboard/notifications/notification.js diff --git a/src/controllers/notificationsettings.js b/src/controllers/dashboard/notifications/notifications.js similarity index 100% rename from src/controllers/notificationsettings.js rename to src/controllers/dashboard/notifications/notifications.js diff --git a/src/controllers/addpluginpage.js b/src/controllers/dashboard/plugins/add.js similarity index 100% rename from src/controllers/addpluginpage.js rename to src/controllers/dashboard/plugins/add.js diff --git a/src/controllers/availableplugins.js b/src/controllers/dashboard/plugins/available.js similarity index 100% rename from src/controllers/availableplugins.js rename to src/controllers/dashboard/plugins/available.js diff --git a/src/controllers/installedplugins.js b/src/controllers/dashboard/plugins/installed.js similarity index 100% rename from src/controllers/installedplugins.js rename to src/controllers/dashboard/plugins/installed.js diff --git a/src/controllers/scheduledtaskpage.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js similarity index 100% rename from src/controllers/scheduledtaskpage.js rename to src/controllers/dashboard/scheduledtasks/scheduledtask.js diff --git a/src/controllers/scheduledtaskspage.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js similarity index 100% rename from src/controllers/scheduledtaskspage.js rename to src/controllers/dashboard/scheduledtasks/scheduledtasks.js diff --git a/src/scripts/routes.js b/src/scripts/routes.js index a72e7e0566..c4e7dbb58a 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -16,28 +16,14 @@ define([ function defineRoute(newRoute) { var path = newRoute.path; - console.log("Defining route: " + path); + console.log("defining route: " + path); newRoute.dictionary = "core"; Emby.Page.addRoute(path, newRoute); } - console.log("Defining core routes"); + console.log("defining core routes"); - defineRoute({ - path: "/addplugin.html", - autoFocus: false, - roles: "admin", - controller: "addpluginpage" - }); - defineRoute({ - path: "/autoorganizelog.html", - roles: "admin" - }); - defineRoute({ - path: "/channelsettings.html", - autoFocus: false, - roles: "admin" - }); + // authentication defineRoute({ path: "/addserver.html", autoFocus: false, @@ -45,15 +31,51 @@ define([ startup: true, controller: "addserver" }); + defineRoute({ + path: "/forgotpassword.html", + anonymous: true, + startup: true, + controller: "forgotpassword" + }); + defineRoute({ + path: "/forgotpasswordpin.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "forgotpasswordpin" + }); + + // playback + defineRoute({ + path: "/nowplaying.html", + controller: "nowplayingpage", + autoFocus: false, + transition: "fade", + fullscreen: true, + supportsThemeMedia: true, + enableMediaControl: false + }); + defineRoute({ + path: "/videoosd.html", + transition: "fade", + controller: "videoosd", + autoFocus: false, + type: "video-osd", + supportsThemeMedia: true, + fullscreen: true, + enableMediaControl: false + }); + + // dashboard defineRoute({ path: "/dashboard.html", autoFocus: false, roles: "admin", - controller: "dashboardpage" + controller: "dashboard/dashboard" }); defineRoute({ path: "/dashboardgeneral.html", - controller: "dashboardgeneral", + controller: "dashboard/general", autoFocus: false, roles: "admin" }); @@ -61,7 +83,7 @@ define([ path: "/networking.html", autoFocus: false, roles: "admin", - controller: "networking" + controller: "dashboard/networking" }); defineRoute({ path: "/devices.html", @@ -104,19 +126,6 @@ define([ roles: "admin", controller: "encodingsettings" }); - defineRoute({ - path: "/forgotpassword.html", - anonymous: true, - startup: true, - controller: "forgotpassword" - }); - defineRoute({ - path: "/forgotpasswordpin.html", - autoFocus: false, - anonymous: true, - startup: true, - controller: "forgotpasswordpin" - }); defineRoute({ path: "/home.html", autoFocus: false, @@ -130,11 +139,6 @@ define([ controller: "list", transition: "fade" }); - defineRoute({ - path: "/index.html", - autoFocus: false, - isDefaultRoute: true - }); defineRoute({ path: "/itemdetails.html", controller: "itemdetailpage", @@ -191,7 +195,7 @@ define([ defineRoute({ path: "/log.html", roles: "admin", - controller: "logpage" + controller: "dashboard/logs" }); defineRoute({ path: "/login.html", @@ -269,52 +273,49 @@ define([ path: "/notificationsetting.html", autoFocus: false, roles: "admin", - controller: "notificationsetting" + controller: "dashboard/notifications/notification" }); defineRoute({ path: "/notificationsettings.html", - controller: "notificationsettings", + controller: "dashboard/notifications/notifications", autoFocus: false, roles: "admin" }); - defineRoute({ - path: "/nowplaying.html", - controller: "nowplayingpage", - autoFocus: false, - transition: "fade", - fullscreen: true, - supportsThemeMedia: true, - enableMediaControl: false - }); defineRoute({ path: "/playbackconfiguration.html", autoFocus: false, roles: "admin", controller: "playbackconfiguration" }); + defineRoute({ + path: "/addplugin.html", + autoFocus: false, + roles: "admin", + controller: "dashboard/plugins/add" + }); defineRoute({ path: "/availableplugins.html", autoFocus: false, roles: "admin", - controller: "availableplugins" + controller: "dashboard/plugins/available" }); defineRoute({ path: "/installedplugins.html", autoFocus: false, roles: "admin", - controller: "installedplugins" + controller: "dashboard/plugins/installed" }); defineRoute({ path: "/scheduledtask.html", autoFocus: false, roles: "admin", - controller: "scheduledtaskpage" + controller: "scheduledtasks/scheduledtask" }); defineRoute({ path: "/scheduledtasks.html", autoFocus: false, roles: "admin", - controller: "scheduledtaskspage" + controller: "scheduledtasks/scheduledtasks" }); defineRoute({ path: "/search.html", @@ -345,11 +346,6 @@ define([ roles: "admin", controller: "streamingsettings" }); - defineRoute({ - path: "/support.html", - autoFocus: false, - roles: "admin" - }); defineRoute({ path: "/tv.html", autoFocus: false, @@ -391,6 +387,8 @@ define([ roles: "admin", controller: "userprofilespage" }); + + // startup wizard defineRoute({ path: "/wizardremoteaccess.html", autoFocus: false, @@ -427,16 +425,6 @@ define([ autoFocus: false, anonymous: true }); - defineRoute({ - path: "/videoosd.html", - transition: "fade", - controller: "videoosd", - autoFocus: false, - type: "video-osd", - supportsThemeMedia: true, - fullscreen: true, - enableMediaControl: false - }); defineRoute({ path: "/configurationpage", autoFocus: false, @@ -444,9 +432,16 @@ define([ enableContentQueryString: true, roles: "admin" }); + + // root defineRoute({ path: "/", isDefaultRoute: true, autoFocus: false }); + defineRoute({ + path: "/index.html", + autoFocus: false, + isDefaultRoute: true + }); }); From 4bf12b1682bf51595aa3410c6602f78febe494a8 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 15 Dec 2019 22:42:33 +0900 Subject: [PATCH 02/70] order all routes by category --- src/scripts/routes.js | 223 +++++++++++++++++++++--------------------- 1 file changed, 112 insertions(+), 111 deletions(-) diff --git a/src/scripts/routes.js b/src/scripts/routes.js index c4e7dbb58a..87f55650fd 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -24,6 +24,13 @@ define([ console.log("defining core routes"); // authentication + defineRoute({ + path: "/selectserver.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "selectserver" + }); defineRoute({ path: "/addserver.html", autoFocus: false, @@ -31,6 +38,13 @@ define([ startup: true, controller: "addserver" }); + defineRoute({ + path: "/login.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "loginpage" + }); defineRoute({ path: "/forgotpassword.html", anonymous: true, @@ -66,6 +80,93 @@ define([ enableMediaControl: false }); + // media + defineRoute({ + path: "/home.html", + autoFocus: false, + controller: "home", + transition: "fade", + type: "home" + }); + defineRoute({ + path: "/list.html", + autoFocus: false, + controller: "list", + transition: "fade" + }); + defineRoute({ + path: "/search.html", + controller: "searchpage" + }); + defineRoute({ + path: "/itemdetails.html", + controller: "itemdetailpage", + autoFocus: false, + transition: "fade" + }); + defineRoute({ + path: "/livetv.html", + controller: "livetv/livetvsuggested", + autoFocus: false, + transition: "fade" + }); + defineRoute({ + path: "/movies.html", + autoFocus: false, + controller: "movies/moviesrecommended", + transition: "fade" + }); + defineRoute({ + path: "/music.html", + controller: "music/musicrecommended", + autoFocus: false, + transition: "fade" + }); + defineRoute({ + path: "/tv.html", + autoFocus: false, + controller: "shows/tvrecommended", + transition: "fade" + }); + + // user + defineRoute({ + path: "/mypreferencesmenu.html", + autoFocus: false, + transition: "fade", + controller: "user/menu" + }); + defineRoute({ + path: "/myprofile.html", + autoFocus: false, + transition: "fade", + controller: "user/profile" + }); + defineRoute({ + path: "/mypreferencesdisplay.html", + autoFocus: false, + transition: "fade", + controller: "user/display" + }); + defineRoute({ + path: "/mypreferenceshome.html", + autoFocus: false, + transition: "fade", + controller: "user/home" + }); + defineRoute({ + path: "/mypreferencesplayback.html", + autoFocus: false, + transition: "fade", + controller: "user/playback" + }); + defineRoute({ + path: "/mypreferencessubtitles.html", + autoFocus: false, + transition: "fade", + controller: "user/subtitles" + }); + // dashboard defineRoute({ path: "/dashboard.html", @@ -126,25 +227,6 @@ define([ roles: "admin", controller: "encodingsettings" }); - defineRoute({ - path: "/home.html", - autoFocus: false, - controller: "home", - transition: "fade", - type: "home" - }); - defineRoute({ - path: "/list.html", - autoFocus: false, - controller: "list", - transition: "fade" - }); - defineRoute({ - path: "/itemdetails.html", - controller: "itemdetailpage", - autoFocus: false, - transition: "fade" - }); defineRoute({ path: "/library.html", autoFocus: false, @@ -163,12 +245,6 @@ define([ roles: "admin", controller: "librarysettings" }); - defineRoute({ - path: "/livetv.html", - controller: "livetv/livetvsuggested", - autoFocus: false, - transition: "fade" - }); defineRoute({ path: "/livetvguideprovider.html", autoFocus: false, @@ -197,18 +273,6 @@ define([ roles: "admin", controller: "dashboard/logs" }); - defineRoute({ - path: "/login.html", - autoFocus: false, - anonymous: true, - startup: true, - controller: "loginpage" - }); - defineRoute({ - path: "/metadataadvanced.html", - autoFocus: false, - roles: "admin" - }); defineRoute({ path: "/metadataimages.html", autoFocus: false, @@ -221,54 +285,6 @@ define([ roles: "admin", controller: "metadatanfo" }); - defineRoute({ - path: "/movies.html", - autoFocus: false, - controller: "movies/moviesrecommended", - transition: "fade" - }); - defineRoute({ - path: "/music.html", - controller: "music/musicrecommended", - autoFocus: false, - transition: "fade" - }); - defineRoute({ - path: "/mypreferencesmenu.html", - autoFocus: false, - transition: "fade", - controller: "user/menu" - }); - defineRoute({ - path: "/myprofile.html", - autoFocus: false, - transition: "fade", - controller: "user/profile" - }); - defineRoute({ - path: "/mypreferencesdisplay.html", - autoFocus: false, - transition: "fade", - controller: "user/display" - }); - defineRoute({ - path: "/mypreferenceshome.html", - autoFocus: false, - transition: "fade", - controller: "user/home" - }); - defineRoute({ - path: "/mypreferencesplayback.html", - autoFocus: false, - transition: "fade", - controller: "user/playback" - }); - defineRoute({ - path: "/mypreferencessubtitles.html", - autoFocus: false, - transition: "fade", - controller: "user/subtitles" - }); defineRoute({ path: "/notificationsetting.html", autoFocus: false, @@ -309,24 +325,13 @@ define([ path: "/scheduledtask.html", autoFocus: false, roles: "admin", - controller: "scheduledtasks/scheduledtask" + controller: "dashboard/scheduledtasks/scheduledtask" }); defineRoute({ path: "/scheduledtasks.html", autoFocus: false, roles: "admin", - controller: "scheduledtasks/scheduledtasks" - }); - defineRoute({ - path: "/search.html", - controller: "searchpage" - }); - defineRoute({ - path: "/selectserver.html", - autoFocus: false, - anonymous: true, - startup: true, - controller: "selectserver" + controller: "dashboard/scheduledtasks/scheduledtasks" }); defineRoute({ path: "/serveractivity.html", @@ -346,12 +351,6 @@ define([ roles: "admin", controller: "streamingsettings" }); - defineRoute({ - path: "/tv.html", - autoFocus: false, - controller: "shows/tvrecommended", - transition: "fade" - }); defineRoute({ path: "/useredit.html", autoFocus: false, @@ -388,6 +387,15 @@ define([ controller: "userprofilespage" }); + // plugins + defineRoute({ + path: "/configurationpage", + autoFocus: false, + enableCache: false, + enableContentQueryString: true, + roles: "admin" + }); + // startup wizard defineRoute({ path: "/wizardremoteaccess.html", @@ -425,13 +433,6 @@ define([ autoFocus: false, anonymous: true }); - defineRoute({ - path: "/configurationpage", - autoFocus: false, - enableCache: false, - enableContentQueryString: true, - roles: "admin" - }); // root defineRoute({ From 07994e0a408638639b929b40661bc6faa61679fd Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 15 Dec 2019 23:53:13 +0900 Subject: [PATCH 03/70] move authentication and playback controllers to subdirectories --- src/controllers/{ => auth}/addserver.js | 0 src/controllers/{ => auth}/forgotpassword.js | 0 .../{ => auth}/forgotpasswordpin.js | 0 .../{loginpage.js => auth/login.js} | 0 src/controllers/{ => auth}/selectserver.js | 0 .../{ => playback}/nowplayingpage.js | 0 src/controllers/{ => playback}/videoosd.js | 0 .../access.js} | 0 .../{wizardfinishpage.js => wizard/finish.js} | 0 .../{wizardsettings.js => wizard/settings.js} | 0 .../{wizardstart.js => wizard/start.js} | 0 .../{wizarduserpage.js => wizard/user.js} | 0 src/scripts/routes.js | 24 +++++++++---------- 13 files changed, 12 insertions(+), 12 deletions(-) rename src/controllers/{ => auth}/addserver.js (100%) rename src/controllers/{ => auth}/forgotpassword.js (100%) rename src/controllers/{ => auth}/forgotpasswordpin.js (100%) rename src/controllers/{loginpage.js => auth/login.js} (100%) rename src/controllers/{ => auth}/selectserver.js (100%) rename src/controllers/{ => playback}/nowplayingpage.js (100%) rename src/controllers/{ => playback}/videoosd.js (100%) rename src/controllers/{wizardremoteaccess.js => wizard/access.js} (100%) rename src/controllers/{wizardfinishpage.js => wizard/finish.js} (100%) rename src/controllers/{wizardsettings.js => wizard/settings.js} (100%) rename src/controllers/{wizardstart.js => wizard/start.js} (100%) rename src/controllers/{wizarduserpage.js => wizard/user.js} (100%) diff --git a/src/controllers/addserver.js b/src/controllers/auth/addserver.js similarity index 100% rename from src/controllers/addserver.js rename to src/controllers/auth/addserver.js diff --git a/src/controllers/forgotpassword.js b/src/controllers/auth/forgotpassword.js similarity index 100% rename from src/controllers/forgotpassword.js rename to src/controllers/auth/forgotpassword.js diff --git a/src/controllers/forgotpasswordpin.js b/src/controllers/auth/forgotpasswordpin.js similarity index 100% rename from src/controllers/forgotpasswordpin.js rename to src/controllers/auth/forgotpasswordpin.js diff --git a/src/controllers/loginpage.js b/src/controllers/auth/login.js similarity index 100% rename from src/controllers/loginpage.js rename to src/controllers/auth/login.js diff --git a/src/controllers/selectserver.js b/src/controllers/auth/selectserver.js similarity index 100% rename from src/controllers/selectserver.js rename to src/controllers/auth/selectserver.js diff --git a/src/controllers/nowplayingpage.js b/src/controllers/playback/nowplayingpage.js similarity index 100% rename from src/controllers/nowplayingpage.js rename to src/controllers/playback/nowplayingpage.js diff --git a/src/controllers/videoosd.js b/src/controllers/playback/videoosd.js similarity index 100% rename from src/controllers/videoosd.js rename to src/controllers/playback/videoosd.js diff --git a/src/controllers/wizardremoteaccess.js b/src/controllers/wizard/access.js similarity index 100% rename from src/controllers/wizardremoteaccess.js rename to src/controllers/wizard/access.js diff --git a/src/controllers/wizardfinishpage.js b/src/controllers/wizard/finish.js similarity index 100% rename from src/controllers/wizardfinishpage.js rename to src/controllers/wizard/finish.js diff --git a/src/controllers/wizardsettings.js b/src/controllers/wizard/settings.js similarity index 100% rename from src/controllers/wizardsettings.js rename to src/controllers/wizard/settings.js diff --git a/src/controllers/wizardstart.js b/src/controllers/wizard/start.js similarity index 100% rename from src/controllers/wizardstart.js rename to src/controllers/wizard/start.js diff --git a/src/controllers/wizarduserpage.js b/src/controllers/wizard/user.js similarity index 100% rename from src/controllers/wizarduserpage.js rename to src/controllers/wizard/user.js diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 87f55650fd..0e4544bb6f 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -29,40 +29,40 @@ define([ autoFocus: false, anonymous: true, startup: true, - controller: "selectserver" + controller: "auth/selectserver" }); defineRoute({ path: "/addserver.html", autoFocus: false, anonymous: true, startup: true, - controller: "addserver" + controller: "auth/addserver" }); defineRoute({ path: "/login.html", autoFocus: false, anonymous: true, startup: true, - controller: "loginpage" + controller: "auth/login" }); defineRoute({ path: "/forgotpassword.html", anonymous: true, startup: true, - controller: "forgotpassword" + controller: "auth/forgotpassword" }); defineRoute({ path: "/forgotpasswordpin.html", autoFocus: false, anonymous: true, startup: true, - controller: "forgotpasswordpin" + controller: "auth/forgotpasswordpin" }); // playback defineRoute({ path: "/nowplaying.html", - controller: "nowplayingpage", + controller: "playback/nowplaying", autoFocus: false, transition: "fade", fullscreen: true, @@ -72,7 +72,7 @@ define([ defineRoute({ path: "/videoosd.html", transition: "fade", - controller: "videoosd", + controller: "playback/videoosd", autoFocus: false, type: "video-osd", supportsThemeMedia: true, @@ -401,13 +401,13 @@ define([ path: "/wizardremoteaccess.html", autoFocus: false, anonymous: true, - controller: "wizardremoteaccess" + controller: "wizard/access" }); defineRoute({ path: "/wizardfinish.html", autoFocus: false, anonymous: true, - controller: "wizardfinishpage" + controller: "wizard/finish" }); defineRoute({ path: "/wizardlibrary.html", @@ -419,17 +419,17 @@ define([ path: "/wizardsettings.html", autoFocus: false, anonymous: true, - controller: "wizardsettings" + controller: "wizard/settings" }); defineRoute({ path: "/wizardstart.html", autoFocus: false, anonymous: true, - controller: "wizardstart" + controller: "wizard/start" }); defineRoute({ path: "/wizarduser.html", - controller: "wizarduserpage", + controller: "wizard/user", autoFocus: false, anonymous: true }); From 7f2f10a595c4b85a9296cf0088844e5a35223b47 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 16 Dec 2019 00:07:55 +0900 Subject: [PATCH 04/70] style fixes in html files --- src/addplugin.html | 9 ++----- src/apikeys.html | 6 ++--- src/dashboard.html | 3 --- src/dashboardgeneral.html | 8 +----- src/device.html | 11 +++----- src/devices.html | 6 ++--- src/encodingsettings.html | 7 +++-- src/forgotpassword.html | 6 +---- src/forgotpasswordpin.html | 6 +---- src/itemdetails.html | 48 +++++++++++---------------------- src/librarydisplay.html | 4 +-- src/login.html | 12 +++------ src/manifest.json | 4 +-- src/mypreferencesplayback.html | 5 ++-- src/mypreferencessubtitles.html | 5 ++-- src/myprofile.html | 6 ++--- src/scheduledtask.html | 5 +--- src/scheduledtasks.html | 4 +-- src/search.html | 10 +++---- src/serveractivity.html | 8 +++--- src/streamingsettings.html | 6 +++-- src/videoosd.html | 26 ++++++++---------- 22 files changed, 71 insertions(+), 134 deletions(-) diff --git a/src/addplugin.html b/src/addplugin.html index 309f0f96c4..83640033bb 100644 --- a/src/addplugin.html +++ b/src/addplugin.html @@ -1,10 +1,7 @@
-
-
-

@@ -13,9 +10,7 @@

-

-
@@ -27,12 +22,12 @@
-

+

${ServerRestartNeededAfterPluginInstall}
-

+

diff --git a/src/apikeys.html b/src/apikeys.html index 43cfae5b13..47f032c1f4 100644 --- a/src/apikeys.html +++ b/src/apikeys.html @@ -2,9 +2,7 @@
-

- ${HeaderApiKeys} -

+

${HeaderApiKeys}

@@ -24,4 +22,4 @@
-
\ No newline at end of file +
diff --git a/src/dashboard.html b/src/dashboard.html index 43a081f8db..f29de59f93 100644 --- a/src/dashboard.html +++ b/src/dashboard.html @@ -105,10 +105,8 @@
- -
@@ -118,5 +116,4 @@
- diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html index 91708f382a..6387128d5e 100644 --- a/src/dashboardgeneral.html +++ b/src/dashboardgeneral.html @@ -1,10 +1,7 @@
-
-
-

${TabSettings}

@@ -31,9 +28,7 @@ ${LaunchWebAppOnStartup} -
- ${LaunchWebAppOnStartupHelp} -
+
${LaunchWebAppOnStartupHelp}
@@ -94,7 +89,6 @@
-
diff --git a/src/device.html b/src/device.html index b63d298ca6..11fc9671b1 100644 --- a/src/device.html +++ b/src/device.html @@ -1,11 +1,7 @@
-
- -
-

@@ -18,10 +14,11 @@
- +
-
-
\ No newline at end of file + diff --git a/src/devices.html b/src/devices.html index b05f10fa19..4e6552f05e 100644 --- a/src/devices.html +++ b/src/devices.html @@ -7,9 +7,7 @@ ${Help} - -
-
+
- \ No newline at end of file + diff --git a/src/encodingsettings.html b/src/encodingsettings.html index da7f6c9c6c..3d67544c0b 100644 --- a/src/encodingsettings.html +++ b/src/encodingsettings.html @@ -22,6 +22,7 @@
${LabelHardwareAccelerationTypeHelp}
+
${LabelVaapiDeviceHelp}
@@ -142,9 +143,11 @@
- +
- \ No newline at end of file + diff --git a/src/forgotpassword.html b/src/forgotpassword.html index aac53ed296..d4ed0d4170 100644 --- a/src/forgotpassword.html +++ b/src/forgotpassword.html @@ -1,9 +1,6 @@
-
-
-

${HeaderForgotPassword}

@@ -23,6 +20,5 @@
-
- \ No newline at end of file + diff --git a/src/forgotpasswordpin.html b/src/forgotpasswordpin.html index 0eb8b8a1a5..3b1ba0d37b 100644 --- a/src/forgotpasswordpin.html +++ b/src/forgotpasswordpin.html @@ -1,9 +1,6 @@
-
-
-

${HeaderPasswordReset}

@@ -22,6 +19,5 @@
-
- \ No newline at end of file + diff --git a/src/itemdetails.html b/src/itemdetails.html index 2a29cce96b..303202bf61 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -2,7 +2,6 @@
-
-
- +
+
-
-
-
+
-
-
+
-
+
-
+
-
+
-
+
-
- -
- -
- -
- -
- -
- -
+
@@ -66,7 +51,6 @@
- @@ -217,12 +201,10 @@
-

- ${HeaderSchedule} -

-
-
+

${HeaderSchedule}

+
+

${HeaderNextUp}

@@ -261,6 +243,7 @@
+

${HeaderUpcomingOnTV}

@@ -270,6 +253,7 @@

${HeaderSpecialFeatures}

+

${HeaderMusicVideos}

diff --git a/src/librarydisplay.html b/src/librarydisplay.html index b5510ddb14..25dce48223 100644 --- a/src/librarydisplay.html +++ b/src/librarydisplay.html @@ -47,11 +47,11 @@
${OptionSaveMetadataAsHiddenHelp}
-
+
-
\ No newline at end of file + diff --git a/src/login.html b/src/login.html index 629f434313..21c9d8a347 100644 --- a/src/login.html +++ b/src/login.html @@ -1,11 +1,7 @@
-
-
-

${HeaderPleaseSignIn}

-
@@ -27,13 +23,14 @@ +
-
-
+
+
@@ -56,6 +53,5 @@

-
-
\ No newline at end of file +
diff --git a/src/manifest.json b/src/manifest.json index a87b086dac..fed1177e24 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,5 +1,4 @@ { - "name": "Jellyfin", "description": "Jellyfin: the Free Software Media System.", "lang": "en-US", @@ -8,7 +7,8 @@ "theme_color": "#101010", "background_color": "#101010", "display": "standalone", - "icons": [{ + "icons": [ + { "sizes": "72x72", "src": "touchicon72.png", "type": "image/png" diff --git a/src/mypreferencesplayback.html b/src/mypreferencesplayback.html index 93f806d0d4..d908c06096 100644 --- a/src/mypreferencesplayback.html +++ b/src/mypreferencesplayback.html @@ -1,4 +1,3 @@
-
-
-
\ No newline at end of file +
+ diff --git a/src/mypreferencessubtitles.html b/src/mypreferencessubtitles.html index aa26a8f157..29d1c84898 100644 --- a/src/mypreferencessubtitles.html +++ b/src/mypreferencessubtitles.html @@ -1,4 +1,3 @@
-
-
-
\ No newline at end of file +
+ diff --git a/src/myprofile.html b/src/myprofile.html index d30f905818..3765ac5e75 100644 --- a/src/myprofile.html +++ b/src/myprofile.html @@ -42,9 +42,7 @@
-

- ${HeaderEasyPinCode} -

+

${HeaderEasyPinCode}

${EasyPasswordHelp}

@@ -68,4 +66,4 @@
- \ No newline at end of file + diff --git a/src/scheduledtask.html b/src/scheduledtask.html index ee2a2c3420..8ecaf04dbe 100644 --- a/src/scheduledtask.html +++ b/src/scheduledtask.html @@ -1,7 +1,6 @@
-

@@ -12,9 +11,7 @@
-

- ${HeaderTaskTriggers} -

+

${HeaderTaskTriggers}

diff --git a/src/scheduledtasks.html b/src/scheduledtasks.html index ce4405bab0..cbff6bcd9d 100644 --- a/src/scheduledtasks.html +++ b/src/scheduledtasks.html @@ -1,5 +1,4 @@
-
-
-
\ No newline at end of file +
diff --git a/src/search.html b/src/search.html index 1fc65e3f11..acf65e7317 100644 --- a/src/search.html +++ b/src/search.html @@ -1,8 +1,4 @@
- -
-
- -
-
-
\ No newline at end of file +
+
+
diff --git a/src/serveractivity.html b/src/serveractivity.html index e2e1795691..29cacd300e 100644 --- a/src/serveractivity.html +++ b/src/serveractivity.html @@ -2,13 +2,11 @@
-

-

+

-
-
+
-
\ No newline at end of file +
diff --git a/src/streamingsettings.html b/src/streamingsettings.html index 7efb4a3966..2d51d9ee77 100644 --- a/src/streamingsettings.html +++ b/src/streamingsettings.html @@ -11,8 +11,10 @@
${LabelRemoteClientBitrateLimitHelp}
- +
- \ No newline at end of file + diff --git a/src/videoosd.html b/src/videoosd.html index 0c7a910908..c9a46fd021 100644 --- a/src/videoosd.html +++ b/src/videoosd.html @@ -1,27 +1,19 @@
-
- -
-
-
- +
+
- -
- -
+
-

- autorenew ${FetchingData} + autorenew + ${FetchingData}
-
-
+
@@ -73,7 +65,11 @@ picture_in_picture_alt -
+
+ + + +
-
-
-
- -
-
-
- - - -
-
-
- - - -
-
-
- - - +
+
+
+
+
+ +
+
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
-
-
-
- -
-
-
- -
-

- -

-
-
+
+
+
+ +
+
+
+ +
+

+ +

+
+
From 549482896f5b1461c6a837a472986165c4f798b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Mon, 6 Jan 2020 00:33:28 +0100 Subject: [PATCH 06/70] add string --- src/strings/en-us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 1a1cbae5f3..5de09d2bf7 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -407,6 +407,7 @@ "HeaderMyDevice": "My Device", "HeaderMyMedia": "My Media", "HeaderMyMediaSmall": "My Media (small)", + "HeaderNavigation": "Navigation", "HeaderNewApiKey": "New API Key", "HeaderNewDevices": "New Devices", "HeaderNextEpisodePlayingInValue": "Next Episode Playing in {0}", From fef18d9648d65680857918db5e080829bf320099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Mon, 6 Jan 2020 00:34:43 +0100 Subject: [PATCH 07/70] Update css --- .../remotecontrol/remotecontrol.css | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 0b6a2dbbc5..9e7fc41446 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -12,6 +12,31 @@ text-align: center } +.btnArrowUp, .btnArrowLeft, .btnArrowRight, .btnArrowDown, .btnOk{ + border: 2.7px solid rgba(255, 255, 255, .6); + background-color: rgba(0, 0, 0, .5); +} + +.btnArrowUp{ +border-radius: 40% 40% 10% 10%; +} + +.btnArrowLeft{ +border-radius: 40% 10% 10% 40%; +} + +.btnArrowRight{ +border-radius: 10% 40% 40% 10%; +} + +.btnArrowDown{ +border-radius: 10% 10% 40% 40%; +} + +.btnOk{ +border-radius: 10%; +} + .nowPlayingPageTitle { margin: 0 0 .5em .5em } @@ -197,6 +222,9 @@ .nowPlayingInfoButtons .nowPlayingPageUserDataButtons { display: none !important } + .navigationSection .collapseContent i{ + font-size: 4em; + } } @media all and (max-width:47em) { From 2a80c9c59391e546ec87d7d63839926ba94d6226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Mon, 6 Jan 2020 00:49:55 +0100 Subject: [PATCH 08/70] Hide collapse if not supported --- src/components/remotecontrol/remotecontrol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 3a48c2dbef..68a6bb5f76 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -215,7 +215,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL context.querySelector(".sendTextSection").classList.add("hide"); } - if (!currentPlayer.isLocalPlayer) { + if (-1 != supportedCommands.indexOf("MoveUp" || "MoveDown" || "MoveRight" || "MoveRight" || "MoveLeft" || "Select" || "Back" || "ToggleContextMenu" || "GoToSearch" || "GoToSettings" || "GoHome") && !currentPlayer.isLocalPlayer) { context.querySelector(".navigationSection").classList.remove("hide"); } else { context.querySelector(".navigationSection").classList.add("hide"); From 552390a9f922be0a00231c519e9801d162ac2b2a Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Fri, 3 Jan 2020 23:50:34 +0100 Subject: [PATCH 09/70] Enable headroom only on mobile --- src/components/emby-scroller/emby-scroller.js | 2 +- src/scripts/librarymenu.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/emby-scroller/emby-scroller.js b/src/components/emby-scroller/emby-scroller.js index 0b36483be3..f943047f52 100644 --- a/src/components/emby-scroller/emby-scroller.js +++ b/src/components/emby-scroller/emby-scroller.js @@ -155,7 +155,7 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro initCenterFocus(this, this.scroller); } - if (bindHeader) { + if (bindHeader && layoutManager.mobile) { initHeadroom(this); } diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 7e3b109500..dcf71c735a 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -103,7 +103,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " headerHomeButton.addEventListener("click", onHeaderHomeButtonClick); headerCastButton.addEventListener("click", onCastButtonClicked); - initHeadRoom(skinHeader); + if (layoutManager.mobile) { + initHeadRoom(skinHeader); + } } function onCastButtonClicked() { From a08d142db2ad68d0aeae23cbad0caf77c87447e4 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 8 Jan 2020 01:36:34 +0900 Subject: [PATCH 10/70] move some routes to their original locations for now --- src/scripts/routes.js | 243 ++++++++++++++++++++---------------------- 1 file changed, 116 insertions(+), 127 deletions(-) diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 0e4544bb6f..9f3c794863 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -23,113 +23,12 @@ define([ console.log("defining core routes"); - // authentication defineRoute({ - path: "/selectserver.html", + path: "/addplugin.html", autoFocus: false, - anonymous: true, - startup: true, - controller: "auth/selectserver" + roles: "admin", + controller: "dashboard/plugins/add" }); - defineRoute({ - path: "/addserver.html", - autoFocus: false, - anonymous: true, - startup: true, - controller: "auth/addserver" - }); - defineRoute({ - path: "/login.html", - autoFocus: false, - anonymous: true, - startup: true, - controller: "auth/login" - }); - defineRoute({ - path: "/forgotpassword.html", - anonymous: true, - startup: true, - controller: "auth/forgotpassword" - }); - defineRoute({ - path: "/forgotpasswordpin.html", - autoFocus: false, - anonymous: true, - startup: true, - controller: "auth/forgotpasswordpin" - }); - - // playback - defineRoute({ - path: "/nowplaying.html", - controller: "playback/nowplaying", - autoFocus: false, - transition: "fade", - fullscreen: true, - supportsThemeMedia: true, - enableMediaControl: false - }); - defineRoute({ - path: "/videoosd.html", - transition: "fade", - controller: "playback/videoosd", - autoFocus: false, - type: "video-osd", - supportsThemeMedia: true, - fullscreen: true, - enableMediaControl: false - }); - - // media - defineRoute({ - path: "/home.html", - autoFocus: false, - controller: "home", - transition: "fade", - type: "home" - }); - defineRoute({ - path: "/list.html", - autoFocus: false, - controller: "list", - transition: "fade" - }); - defineRoute({ - path: "/search.html", - controller: "searchpage" - }); - defineRoute({ - path: "/itemdetails.html", - controller: "itemdetailpage", - autoFocus: false, - transition: "fade" - }); - defineRoute({ - path: "/livetv.html", - controller: "livetv/livetvsuggested", - autoFocus: false, - transition: "fade" - }); - defineRoute({ - path: "/movies.html", - autoFocus: false, - controller: "movies/moviesrecommended", - transition: "fade" - }); - defineRoute({ - path: "/music.html", - controller: "music/musicrecommended", - autoFocus: false, - transition: "fade" - }); - defineRoute({ - path: "/tv.html", - autoFocus: false, - controller: "shows/tvrecommended", - transition: "fade" - }); - - // user defineRoute({ path: "/mypreferencesmenu.html", autoFocus: false, @@ -142,6 +41,13 @@ define([ transition: "fade", controller: "user/profile" }); + defineRoute({ + path: "/addserver.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "auth/addserver" + }); defineRoute({ path: "/mypreferencesdisplay.html", autoFocus: false, @@ -167,7 +73,6 @@ define([ controller: "user/subtitles" }); - // dashboard defineRoute({ path: "/dashboard.html", autoFocus: false, @@ -227,6 +132,43 @@ define([ roles: "admin", controller: "encodingsettings" }); + defineRoute({ + path: "/forgotpassword.html", + anonymous: true, + startup: true, + controller: "auth/forgotpassword" + }); + defineRoute({ + path: "/forgotpasswordpin.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "auth/forgotpasswordpin" + }); + defineRoute({ + path: "/home.html", + autoFocus: false, + controller: "home", + transition: "fade", + type: "home" + }); + defineRoute({ + path: "/list.html", + autoFocus: false, + controller: "list", + transition: "fade" + }); + defineRoute({ + path: "/index.html", + autoFocus: false, + isDefaultRoute: true + }); + defineRoute({ + path: "/itemdetails.html", + controller: "itemdetailpage", + autoFocus: false, + transition: "fade" + }); defineRoute({ path: "/library.html", autoFocus: false, @@ -245,6 +187,12 @@ define([ roles: "admin", controller: "librarysettings" }); + defineRoute({ + path: "/livetv.html", + controller: "livetv/livetvsuggested", + autoFocus: false, + transition: "fade" + }); defineRoute({ path: "/livetvguideprovider.html", autoFocus: false, @@ -273,6 +221,13 @@ define([ roles: "admin", controller: "dashboard/logs" }); + defineRoute({ + path: "/login.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "auth/login" + }); defineRoute({ path: "/metadataimages.html", autoFocus: false, @@ -285,6 +240,18 @@ define([ roles: "admin", controller: "metadatanfo" }); + defineRoute({ + path: "/movies.html", + autoFocus: false, + controller: "movies/moviesrecommended", + transition: "fade" + }); + defineRoute({ + path: "/music.html", + controller: "music/musicrecommended", + autoFocus: false, + transition: "fade" + }); defineRoute({ path: "/notificationsetting.html", autoFocus: false, @@ -297,18 +264,21 @@ define([ autoFocus: false, roles: "admin" }); + defineRoute({ + path: "/nowplaying.html", + controller: "playback/nowplaying", + autoFocus: false, + transition: "fade", + fullscreen: true, + supportsThemeMedia: true, + enableMediaControl: false + }); defineRoute({ path: "/playbackconfiguration.html", autoFocus: false, roles: "admin", controller: "playbackconfiguration" }); - defineRoute({ - path: "/addplugin.html", - autoFocus: false, - roles: "admin", - controller: "dashboard/plugins/add" - }); defineRoute({ path: "/availableplugins.html", autoFocus: false, @@ -333,6 +303,17 @@ define([ roles: "admin", controller: "dashboard/scheduledtasks/scheduledtasks" }); + defineRoute({ + path: "/search.html", + controller: "searchpage" + }); + defineRoute({ + path: "/selectserver.html", + autoFocus: false, + anonymous: true, + startup: true, + controller: "auth/selectserver" + }); defineRoute({ path: "/serveractivity.html", autoFocus: false, @@ -351,6 +332,12 @@ define([ roles: "admin", controller: "streamingsettings" }); + defineRoute({ + path: "/tv.html", + autoFocus: false, + controller: "shows/tvrecommended", + transition: "fade" + }); defineRoute({ path: "/useredit.html", autoFocus: false, @@ -387,16 +374,6 @@ define([ controller: "userprofilespage" }); - // plugins - defineRoute({ - path: "/configurationpage", - autoFocus: false, - enableCache: false, - enableContentQueryString: true, - roles: "admin" - }); - - // startup wizard defineRoute({ path: "/wizardremoteaccess.html", autoFocus: false, @@ -434,15 +411,27 @@ define([ anonymous: true }); - // root + defineRoute({ + path: "/videoosd.html", + transition: "fade", + controller: "playback/videoosd", + autoFocus: false, + type: "video-osd", + supportsThemeMedia: true, + fullscreen: true, + enableMediaControl: false + }); + defineRoute({ + path: "/configurationpage", + autoFocus: false, + enableCache: false, + enableContentQueryString: true, + roles: "admin" + }); + defineRoute({ path: "/", isDefaultRoute: true, autoFocus: false }); - defineRoute({ - path: "/index.html", - autoFocus: false, - isDefaultRoute: true - }); }); From 503dbb5767ffa96e23cb88fc1f1e132e94b06885 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 11 Jan 2020 01:17:17 +0900 Subject: [PATCH 11/70] possible fix for ogg playback with chrome --- src/scripts/browserdeviceprofile.js | 90 ++++++++++------------------- 1 file changed, 29 insertions(+), 61 deletions(-) diff --git a/src/scripts/browserdeviceprofile.js b/src/scripts/browserdeviceprofile.js index bc7c26769e..18b85a6dc0 100644 --- a/src/scripts/browserdeviceprofile.js +++ b/src/scripts/browserdeviceprofile.js @@ -6,15 +6,12 @@ define(['browser'], function (browser) { } function canPlayH265(videoTestElement, options) { - if (browser.tizen || browser.orsay || browser.xboxOne || browser.web0s || options.supportsHevc) { return true; } var userAgent = navigator.userAgent.toLowerCase(); - if (browser.chromecast) { - var isChromecastUltra = userAgent.indexOf('aarch64') !== -1; if (isChromecastUltra) { return true; @@ -31,7 +28,6 @@ define(['browser'], function (browser) { var _supportsTextTracks; function supportsTextTracks() { - if (browser.tizen || browser.orsay) { return true; } @@ -46,15 +42,14 @@ define(['browser'], function (browser) { var _canPlayHls; function canPlayHls(src) { - if (_canPlayHls == null) { _canPlayHls = canPlayNativeHls() || canPlayHlsWithMSE(); } + return _canPlayHls; } function canPlayNativeHls() { - if (browser.tizen || browser.orsay) { return true; } @@ -77,8 +72,27 @@ define(['browser'], function (browser) { return false; } - function canPlayAudioFormat(format) { + function supportsAc3(videoTestElement) { + if (browser.edgeUwp || browser.tizen || browser.orsay || browser.web0s) { + return true; + } + if (browser.osx || browser.iOS) { + return false; + } + + return videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, ''); + } + + function supportsEac3(videoTestElement) { + if (browser.tizen || browser.orsay || browser.web0s) { + return true; + } + + return videoTestElement.canPlayType('audio/mp4; codecs="ec-3"').replace(/no/, ''); + } + + function canPlayAudioFormat(format) { var typeString; if (format === 'flac') { @@ -97,14 +111,12 @@ define(['browser'], function (browser) { } } else if (format === 'opus') { typeString = 'audio/ogg; codecs="opus"'; - if (document.createElement('audio').canPlayType(typeString).replace(/no/, '')) { return true; } return false; } else if (format === 'mp2') { - // For now return false; } @@ -113,14 +125,6 @@ define(['browser'], function (browser) { typeString = 'audio/webm'; } else if (format === 'mp2') { typeString = 'audio/mpeg'; - } else if (format === 'ogg' || format === 'oga') { - - // chrome says probably, but seeing failures - if (browser.chrome) { - return false; - } - typeString = 'audio/' + format; - } else { typeString = 'audio/' + format; } @@ -133,7 +137,6 @@ define(['browser'], function (browser) { } function testCanPlayMkv(videoTestElement) { - if (browser.tizen || browser.orsay || browser.web0s) { return true; } @@ -147,7 +150,6 @@ define(['browser'], function (browser) { // Unfortunately there's no real way to detect mkv support if (browser.chrome) { - // Not supported on opera tv if (browser.operaTv) { return false; @@ -162,7 +164,6 @@ define(['browser'], function (browser) { } if (browser.edgeUwp) { - return true; } @@ -174,17 +175,15 @@ define(['browser'], function (browser) { } function supportsMpeg2Video() { - return browser.orsay || browser.tizen || browser.edgeUwp || browser.web0s; + return browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp; } function supportsVc1() { - return browser.orsay || browser.tizen || browser.edgeUwp || browser.web0s; + return browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp; } function getFlvMseDirectPlayProfile() { - var videoAudioCodecs = ['aac']; - if (!browser.edge && !browser.msie) { videoAudioCodecs.push('mp3'); } @@ -198,13 +197,11 @@ define(['browser'], function (browser) { } function getDirectPlayProfileForVideoContainer(container, videoAudioCodecs, videoTestElement, options) { - var supported = false; var profileContainer = container; var videoCodecs = []; switch (container) { - case 'asf': supported = browser.tizen || browser.orsay || browser.edgeUwp; videoAudioCodecs = []; @@ -279,16 +276,12 @@ define(['browser'], function (browser) { } function getMaxBitrate() { - return 120000000; } function getGlobalMaxVideoBitrate() { - var userAgent = navigator.userAgent.toLowerCase(); - if (browser.chromecast) { - var isChromecastUltra = userAgent.indexOf('aarch64') !== -1; if (isChromecastUltra) { return null; @@ -319,27 +312,9 @@ define(['browser'], function (browser) { (browser.tizen && isTizenFhd ? 20000000 : null))); } - function supportsAc3(videoTestElement) { - - if (browser.edgeUwp || browser.tizen || browser.orsay || browser.web0s) { - return true; - } - - return (videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.osx && !browser.iOS); - } - - function supportsEac3(videoTestElement) { - - if (browser.tizen || browser.orsay || browser.web0s) { - return true; - } - - return videoTestElement.canPlayType('audio/mp4; codecs="ec-3"').replace(/no/, ''); - } - return function (options) { - options = options || {}; + var physicalAudioChannels = options.audioChannels || (browser.tv || browser.ps4 || browser.xboxOne ? 6 : 2); var bitrateSetting = getMaxBitrate(); @@ -417,7 +392,6 @@ define(['browser'], function (browser) { // PS4 fails to load HLS with mp3 audio if (!browser.ps4) { - // mp3 encoder only supports 2 channels, so only make that preferred if we're only requesting 2 channels // Also apply it for chromecast because it no longer supports AAC 5.1 if (physicalAudioChannels <= 2) { @@ -425,14 +399,15 @@ define(['browser'], function (browser) { } } } - if (canPlayAacVideoAudio) { + if (canPlayAacVideoAudio) { if (videoAudioCodecs.indexOf('aac') === -1) { videoAudioCodecs.push('aac'); } hlsVideoAudioCodecs.push('aac'); } + if (supportsMp3VideoAudio) { // PS4 fails to load HLS with mp3 audio if (!browser.ps4) { @@ -525,6 +500,7 @@ define(['browser'], function (browser) { if (canPlayVp8) { mp4VideoCodecs.push('vp8'); } + if (canPlayVp9) { mp4VideoCodecs.push('vp9'); } @@ -563,20 +539,17 @@ define(['browser'], function (browser) { ['opus', 'mp3', 'mp2', 'aac', 'flac', 'alac', 'webma', 'wma', 'wav', 'ogg', 'oga'].filter(canPlayAudioFormat).forEach(function (audioFormat) { if (audioFormat === 'mp2') { - profile.DirectPlayProfiles.push({ Container: 'mp2,mp3', Type: 'Audio', AudioCodec: audioFormat }); } else if (audioFormat === 'mp3') { - profile.DirectPlayProfiles.push({ Container: audioFormat, Type: 'Audio', AudioCodec: audioFormat }); - } else { profile.DirectPlayProfiles.push({ Container: audioFormat === 'webma' ? 'webma,webm' : audioFormat, @@ -586,7 +559,6 @@ define(['browser'], function (browser) { // aac also appears in the m4a container if (audioFormat === 'aac' || audioFormat === 'alac') { - profile.DirectPlayProfiles.push({ Container: 'm4a', AudioCodec: audioFormat, @@ -619,7 +591,6 @@ define(['browser'], function (browser) { if (canPlayHls() && browser.enableHlsAudio !== false) { profile.TranscodingProfiles.push({ - // hlsjs, edge, and android all seem to require ts container Container: !canPlayNativeHls() || browser.edge || browser.android ? 'ts' : 'aac', Type: 'Audio', @@ -636,7 +607,6 @@ define(['browser'], function (browser) { // But for static (offline sync), it will be just fine. // Prioritize aac higher because the encoder can accept more channels than mp3 ['aac', 'mp3', 'opus', 'wav'].filter(canPlayAudioFormat).forEach(function (audioFormat) { - profile.TranscodingProfiles.push({ Container: audioFormat, Type: 'Audio', @@ -648,7 +618,6 @@ define(['browser'], function (browser) { }); ['opus', 'mp3', 'aac', 'wav'].filter(canPlayAudioFormat).forEach(function (audioFormat) { - profile.TranscodingProfiles.push({ Container: audioFormat, Type: 'Audio', @@ -804,7 +773,8 @@ define(['browser'], function (browser) { Condition: 'LessThanEqual', Property: 'VideoLevel', Value: maxH264Level.toString() - }] + } + ] }); if (!browser.edgeUwp && !browser.tizen && !browser.orsay && !browser.web0s) { @@ -888,7 +858,6 @@ define(['browser'], function (browser) { // External vtt or burn in profile.SubtitleProfiles = []; if (supportsTextTracks()) { - profile.SubtitleProfiles.push({ Format: 'vtt', Method: 'External' @@ -896,7 +865,6 @@ define(['browser'], function (browser) { } profile.ResponseProfiles = []; - profile.ResponseProfiles.push({ Type: 'Video', Container: 'm4v', From 8d7e749ed8bf9b2ff35d526ece707971e66a60dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Fri, 10 Jan 2020 18:02:08 +0100 Subject: [PATCH 12/70] fix indentation --- src/components/remotecontrol/remotecontrol.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 9e7fc41446..c9c0d2c316 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -18,23 +18,23 @@ } .btnArrowUp{ -border-radius: 40% 40% 10% 10%; + border-radius: 40% 40% 10% 10%; } .btnArrowLeft{ -border-radius: 40% 10% 10% 40%; + border-radius: 40% 10% 10% 40%; } .btnArrowRight{ -border-radius: 10% 40% 40% 10%; + border-radius: 10% 40% 40% 10%; } .btnArrowDown{ -border-radius: 10% 10% 40% 40%; + border-radius: 10% 10% 40% 40%; } .btnOk{ -border-radius: 10%; + border-radius: 10%; } .nowPlayingPageTitle { From 747bbca7fe14aef71bb9bfc196b27ef6f78ba38e Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 11 Jan 2020 15:28:19 +0900 Subject: [PATCH 13/70] fix instant mix icon --- src/components/itemcontextmenu.js | 2 +- src/itemdetails.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/itemcontextmenu.js b/src/components/itemcontextmenu.js index f9f67082d9..02ef9ee0e4 100644 --- a/src/components/itemcontextmenu.js +++ b/src/components/itemcontextmenu.js @@ -70,7 +70,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter", commands.push({ name: globalize.translate("InstantMix"), id: "instantmix", - icon: "shuffle" + icon: "explore" }); } } diff --git a/src/itemdetails.html b/src/itemdetails.html index 5240cd5744..1b4788ec77 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -45,7 +45,7 @@ From 1922cfe51a4994a0e6ada73f09b83f76e61d9596 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 11 Jan 2020 15:33:53 +0900 Subject: [PATCH 14/70] change edit image icon --- src/components/itemcontextmenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/itemcontextmenu.js b/src/components/itemcontextmenu.js index 02ef9ee0e4..63c7350fd4 100644 --- a/src/components/itemcontextmenu.js +++ b/src/components/itemcontextmenu.js @@ -178,7 +178,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter", commands.push({ name: globalize.translate("EditImages"), id: "editimages", - icon: "edit" + icon: "image" }); } } From da87b4a6205495c6813a6f82baeafe4cab3054fd Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 12 Jan 2020 00:06:25 +0900 Subject: [PATCH 15/70] shrink ci file and update display names --- .ci/azure-pipelines.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index e6889afb1f..0d6b018e07 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -20,24 +20,21 @@ jobs: steps: - task: NodeTool@0 - displayName: 'Install Node.js' + displayName: 'Install Node' inputs: versionSpec: '10.x' - - script: | - yarn install - displayName: 'Install dependencies' + - script: 'yarn install' + displayName: 'Install Dependencies' - - script: | - test -d dist - displayName: 'Check dist directory' + - script: 'test -d dist' + displayName: 'Check Build' - - script: | - yarn pack --filename jellyfin-web.tgz - displayName: 'Build package' + - script: 'yarn pack --filename jellyfin-web.tgz' + displayName: 'Bundle Release' - task: PublishPipelineArtifact@1 - displayName: 'Publish package' + displayName: 'Publish Release' condition: succeeded() inputs: targetPath: '$(Build.SourcesDirectory)/jellyfin-web.tgz' @@ -51,14 +48,12 @@ jobs: steps: - task: NodeTool@0 - displayName: 'Install Node.js' + displayName: 'Install Node' inputs: versionSpec: '10.x' - - script: | - yarn install - displayName: 'Install dependencies' + - script: 'yarn install' + displayName: 'Install Dependencies' - - script: | - yarn run lint + - script: 'yarn run lint' displayName: 'Run ESLint' From 3047b12382691ce9d2480eb576fa9708ca4f07c3 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 12 Jan 2020 02:23:16 +0900 Subject: [PATCH 16/70] add code suggestions --- src/controllers/wizard/{access.js => remoteaccess.js} | 0 src/scripts/routes.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/controllers/wizard/{access.js => remoteaccess.js} (100%) diff --git a/src/controllers/wizard/access.js b/src/controllers/wizard/remoteaccess.js similarity index 100% rename from src/controllers/wizard/access.js rename to src/controllers/wizard/remoteaccess.js diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 9f3c794863..a3427c6551 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -378,7 +378,7 @@ define([ path: "/wizardremoteaccess.html", autoFocus: false, anonymous: true, - controller: "wizard/access" + controller: "wizard/remoteaccess" }); defineRoute({ path: "/wizardfinish.html", From 88d8c580e5a90f18e7572eef913dfdb9bdea6ac6 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 12 Jan 2020 16:05:05 +0900 Subject: [PATCH 17/70] string improvements --- src/components/htmlvideoplayer/plugin.js | 7 +------ src/strings/en-gb.json | 4 ++-- src/strings/en-us.json | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/components/htmlvideoplayer/plugin.js b/src/components/htmlvideoplayer/plugin.js index adc76f67b1..6f973b7ac5 100644 --- a/src/components/htmlvideoplayer/plugin.js +++ b/src/components/htmlvideoplayer/plugin.js @@ -95,23 +95,19 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa } function getMediaStreamAudioTracks(mediaSource) { - return mediaSource.MediaStreams.filter(function (s) { return s.Type === 'Audio'; }); } function getMediaStreamTextTracks(mediaSource) { - return mediaSource.MediaStreams.filter(function (s) { return s.Type === 'Subtitle'; }); } function zoomIn(elem) { - return new Promise(function (resolve, reject) { - var duration = 240; elem.style.animation = 'htmlvideoplayer-zoomin ' + duration + 'ms ease-in normal'; dom.addEventListener(elem, dom.whichAnimationEvent(), resolve, { @@ -1417,7 +1413,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa if (!appHost.supports('htmlvideoautoplay')) { html += '
-
\ No newline at end of file +
diff --git a/src/userlibraryaccess.html b/src/userlibraryaccess.html index 6238391814..4653fd07eb 100644 --- a/src/userlibraryaccess.html +++ b/src/userlibraryaccess.html @@ -6,7 +6,7 @@

- ${Help} + ${Help}
@@ -65,4 +65,4 @@
-
\ No newline at end of file + diff --git a/src/usernew.html b/src/usernew.html index 2e091e8d93..bca1e72fea 100644 --- a/src/usernew.html +++ b/src/usernew.html @@ -5,7 +5,7 @@

${HeaderAddUser}

- ${Help} + ${Help}
@@ -59,4 +59,4 @@
- \ No newline at end of file + diff --git a/src/userparentalcontrol.html b/src/userparentalcontrol.html index 302969b6c7..6c35913338 100644 --- a/src/userparentalcontrol.html +++ b/src/userparentalcontrol.html @@ -4,7 +4,7 @@

- ${Help} + ${Help}
diff --git a/src/userpassword.html b/src/userpassword.html index 3f65c214fc..f38e395999 100644 --- a/src/userpassword.html +++ b/src/userpassword.html @@ -4,7 +4,7 @@

- ${Help} + ${Help}
From 89cf454e918191da03db065f89c1e3123e17fb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 15 Jan 2020 17:45:23 +0100 Subject: [PATCH 36/70] Update dpad --- src/nowplaying.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index 93543b6a0f..ac5a2202df 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -79,19 +79,19 @@
-

- - -
@@ -100,7 +100,7 @@ -
From cdfd41c0e2b33d07caf1951f5f2fe179733c0185 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 20 Jan 2020 10:15:28 +0900 Subject: [PATCH 55/70] move all documentation links to subdomain --- src/dlnasettings.html | 2 +- src/networking.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dlnasettings.html b/src/dlnasettings.html index 8c44f751a5..872d546a53 100644 --- a/src/dlnasettings.html +++ b/src/dlnasettings.html @@ -8,7 +8,7 @@

${TabSettings}

- ${Help} + ${Help}
diff --git a/src/networking.html b/src/networking.html index 35468a94c9..0a08166cc3 100644 --- a/src/networking.html +++ b/src/networking.html @@ -5,7 +5,7 @@

${TabNetworking}

- ${Help} + ${Help}
From ac435adda3b69596f97ff70c59b0703d6988e845 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 20 Jan 2020 10:38:53 +0900 Subject: [PATCH 56/70] add a folder for useful scripts --- scripts/scdup.py | 41 +++++++++++++++++++++++++++++++++++++++++ scripts/scgen.py | 40 ++++++++++++++++++++++++++++++++++++++++ scripts/scrm.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 scripts/scdup.py create mode 100644 scripts/scgen.py create mode 100644 scripts/scrm.py diff --git a/scripts/scdup.py b/scripts/scdup.py new file mode 100644 index 0000000000..468e31f14a --- /dev/null +++ b/scripts/scdup.py @@ -0,0 +1,41 @@ +import sys +import os +import json + +# load every key in the source language +# check the keys in all translations +# remove keys that only exist in translations + +cwd = os.getcwd() +langdir = cwd + '/../src/strings' +langlst = os.listdir(langdir) + +langlst.remove('en-us.json') +print(langlst) +input('press enter to continue') + +keysus = [] +with open(langdir + '/' + 'en-us.json') as en: + langus = json.load(en) + for key in langus: + keysus.append(key) + +for lang in langlst: + with open(langdir + '/' + lang, 'r') as f: + inde = 2 + if '\n \"' in f.read(): + inde = 4 + f.close() + with open(langdir + '/' + lang, 'r+') as f: + langjson = json.load(f) + langjnew = {} + for key in langjson: + if key in keysus: + langjnew[key] = langjson[key] + f.seek(0) + f.write(json.dumps(langjnew, indent=inde, sort_keys=False, ensure_ascii=False)) + f.write('\n') + f.truncate() + f.close() + +print('DONE') diff --git a/scripts/scgen.py b/scripts/scgen.py new file mode 100644 index 0000000000..0d831426e6 --- /dev/null +++ b/scripts/scgen.py @@ -0,0 +1,40 @@ +import os +import subprocess +import json + +# load all keys in the source language +# check entire codebase for usages +# print unused keys to a text file +# TODO: dynamic string usages cause false positives + +cwd = os.getcwd() +langdir = cwd + '/../src/strings' +langlst = [] +langlst.append('en-us.json') + +# unused keys +dep = [] + +def grep(key): + command = 'grep -r -E "(\(\\\"|\(\'|\{)%s(\\\"|\'|\})" --include=\*.{js,html} --exclude-dir=../src/strings ../src' % key + p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + output = p.stdout.readlines() + if output: + print('DONE: ' + key) + return True + print('UNUSED: ' + key) + dep.append(key) + return False + +for lang in langlst: + with open(langdir + '/' + lang) as f: + langjson = json.load(f) + for key in langjson: + grep(key) + +print(dep) +print('LENGTH: ' + str(len(dep))) +with open('scout.txt', 'w') as out: + for item in dep: + out.write(item + '\n') + out.close() diff --git a/scripts/scrm.py b/scripts/scrm.py new file mode 100644 index 0000000000..9bd5bc2a48 --- /dev/null +++ b/scripts/scrm.py @@ -0,0 +1,34 @@ +import sys +import os +import json + +# load text file containing unused keys +# remove the keys from all string files + +cwd = os.getcwd() +langdir = cwd + '/../src/strings' +langlst = os.listdir(langdir) + +keys = [] + +with open('scout.txt', 'r') as f: + for line in f: + keys.append(line.strip('\n')) + +for lang in langlst: + with open(langdir + '/' + lang, 'r') as f: + inde = 2 + if '\n \"' in f.read(): + inde = 4 + f.close() + with open(langdir + '/' + lang, 'r+') as f: + langjson = json.load(f) + for key in keys: + langjson.pop(key, None) + f.seek(0) + f.write(json.dumps(langjson, indent=inde, sort_keys=False, ensure_ascii=False)) + f.write('\n') + f.truncate() + f.close() + +print('DONE') From 7395a23b4859b9e84cc1bc4dbe25e4c14328e151 Mon Sep 17 00:00:00 2001 From: tluciomiranda Date: Sun, 19 Jan 2020 14:04:33 +0000 Subject: [PATCH 57/70] Translated using Weblate (Portuguese (Portugal)) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/pt_PT/ --- src/strings/pt-pt.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json index 6e355cfa0f..19f00d9e0f 100644 --- a/src/strings/pt-pt.json +++ b/src/strings/pt-pt.json @@ -1327,5 +1327,23 @@ "LabelSportsCategories": "Categorias de Desporto:", "FetchingData": "A transferir informação adicional", "List": "lista", - "LaunchWebAppOnStartup": "Iniciar a interface web ao iniciar o servidor" + "LaunchWebAppOnStartup": "Iniciar a interface web ao iniciar o servidor", + "No": "Não", + "OptionRegex": "Expressão Regular", + "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)", + "NoSubtitles": " Sem legendas", + "NoSubtitleSearchResultsFound": "Sem resultados.", + "NoNewDevicesFound": "Não foi encontrado nenhum dispositivo novo. Para adicionar um novo sintonizador, feche este diálogo e introduza manualmente as informações do dispositivo.", + "NextUp": "A Seguir", + "Next": "Próximo", + "NewEpisodesOnly": "Apenas novos episódios", + "NewEpisodes": "Novos episódios", + "Never": "Nunca", + "Name": "Nome", + "MusicVideo": " Vídeo de Música", + "MusicArtist": "Artista de Música", + "MusicAlbum": " Álbum de Música", + "MoreMediaInfo": "Informações", + "MediaInfoBitrate": "Taxa de Bits", + "LabelUserAgent": "User-Agent:" } From 6a4de9d253272085f3381ae639ba2110ee768566 Mon Sep 17 00:00:00 2001 From: nextlooper42 Date: Sun, 19 Jan 2020 15:18:24 +0000 Subject: [PATCH 58/70] Translated using Weblate (Slovak) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/sk/ --- src/strings/sk.json | 70 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/strings/sk.json b/src/strings/sk.json index 127624ade0..ec536dd17a 100644 --- a/src/strings/sk.json +++ b/src/strings/sk.json @@ -31,7 +31,7 @@ "ButtonAddMediaLibrary": "Pridať knižnicu médií", "ButtonAddScheduledTaskTrigger": "Pridať spúštač", "ButtonAddServer": "Pridať server", - "ButtonAddUser": "Pridať užívateľa", + "ButtonAddUser": "Pridať používateľa", "ButtonArrowDown": "Dole", "ButtonArrowLeft": "Vľavo", "ButtonArrowRight": "Vpravo", @@ -89,13 +89,13 @@ "ButtonSort": "Zoradiť", "ButtonSubmit": "Potvrdiť", "ButtonSubtitles": "Titulky", - "ButtonTrailer": "Ukážka", + "ButtonTrailer": "Trailer", "ButtonUninstall": "Odinštalovať", "ButtonUp": "Hore", "ButtonViewWebsite": "Zobraziť web stránku", "ButtonWebsite": "Webové stránky", "Categories": "Kategórie", - "ChannelAccessHelp": "Zvoľte kanály zdieľané s týmto užívateľom. Administrátori budú schopní upraviť všetky kanály použitím správcu metadát.", + "ChannelAccessHelp": "Zvoľte kanály zdieľané s týmto používateľom. Administrátori budú schopní upraviť všetky kanály použitím správcu metadát.", "Channels": "Kanály", "Collections": "Kolekcie", "ColorSpace": "Farebný priestor", @@ -121,15 +121,15 @@ "Descending": "Zostupne", "Desktop": "Stolný počítač", "DetectingDevices": "Detegujem zariadenia", - "DeviceAccessHelp": "Táto možnosť sa vzťahuje iba na zariadenia, ktoré môžu byť jedinečne identifikované a nezabráni prístup cez prehliadač. Filtrovaním prístupu užívateľských zariadení zabraňuje užívateľom použiť nové zariadenie, pokiaľ neboli tu schválené.", + "DeviceAccessHelp": "Táto možnosť sa vzťahuje iba na zariadenia, ktoré môžu byť jedinečne identifikované a nezabráni prístup cez prehliadač. Filtrovaním prístupu používateľských zariadení zabraňuje užívateľom použiť nové zariadenie, pokiaľ neboli tu schválené.", "Director": "Režisér", - "DirectorValue": "Režisér: {0}", + "DirectorValue": "Réžia: {0}", "DirectorsValue": "Režiséri: {0}", "Disc": "Disk", "Disconnect": "Odpojiť", "Dislike": "Nepáči sa mi to", "DisplayInMyMedia": "Zobraziť na domácej obrazovke", - "DisplayMissingEpisodesWithinSeasons": "Zobraziť chýbajúce epizódy v rámci sezóny", + "DisplayMissingEpisodesWithinSeasons": "Zobraziť chýbajúce epizódy v rámci série", "DoNotRecord": "Nenahrávať", "Down": "Dole", "Download": "Stiahnuť", @@ -177,9 +177,9 @@ "HeaderActiveDevices": "Aktívne zariadenia", "HeaderActiveRecordings": "Aktívne nahrávky", "HeaderActivity": "Aktivita", - "HeaderAddToCollection": "Pridať do zbierky", + "HeaderAddToCollection": "Pridať do kolekcie", "HeaderAddUpdateImage": "Pridať/nahrať obrázok", - "HeaderAddUser": "Pridať užívateľa", + "HeaderAddUser": "Pridať používateľa", "HeaderAlbums": "Albumy", "HeaderApiKey": "Kľúč API", "HeaderApiKeys": "Kľúče API", @@ -191,7 +191,7 @@ "HeaderChannels": "Kanály", "HeaderChapterImages": "Obrázky kapitol", "HeaderConfigureRemoteAccess": "Nastaviť vzdialený prístup", - "HeaderConfirmPluginInstallation": "Potvrdiť inštaláciu rozšírenia", + "HeaderConfirmPluginInstallation": "Potvrdiť inštaláciu zásuvných modulov", "HeaderConfirmProfileDeletion": "Potvrdiť zmazanie profilu", "HeaderConnectToServer": "Propojiť sa k serveru", "HeaderConnectionFailure": "Chyba pripojenia", @@ -271,7 +271,7 @@ "HeaderRunningTasks": "Bežiace úlohy", "HeaderScenes": "Scény", "HeaderSchedule": "Rozvrh", - "HeaderSeasons": "Sezóny", + "HeaderSeasons": "Série", "HeaderSecondsValue": "{0} sekúnd", "HeaderSelectPath": "Vybrať priečinok", "HeaderSelectServer": "Vybrať server", @@ -328,13 +328,13 @@ "LabelAutomaticallyRefreshInternetMetadataEvery": "Automaticky obnoviť metadáta z internetu:", "LabelBirthDate": "Dátum narodenia:", "LabelBirthYear": "Rok narodenia:", - "LabelCachePath": "Cesta k medzipamäti:", + "LabelCachePath": "Cesta k cache:", "LabelCachePathHelp": "Špecifikujte vlastnú cestu pre cache súbory ako sú napr. obrázky. Ponechajte prázdne pre pôvodné nastavenia servera.", "LabelCancelled": "Zrušené", "LabelCertificatePassword": "Heslo certifikátu:", "LabelCertificatePasswordHelp": "Ak váš certifikát vyžaduje heslo, zadajte ho tu prosím.", "LabelChannels": "Kanály:", - "LabelCollection": "Zbierka:", + "LabelCollection": "Kolekcia:", "LabelCommunityRating": "Hodnotenie komunity:", "LabelContentType": "Typ obsahu:", "LabelCountry": "Krajina:", @@ -450,14 +450,14 @@ "LabelProtocolInfo": "Info o protokole:", "LabelPublicHttpPort": "Verejný HTTP port:", "LabelPublicHttpsPort": "Verejný HTTPS port:", - "LabelReadHowYouCanContribute": "Zistite ako môžete prispieť.", + "LabelReadHowYouCanContribute": "Zistite, ako môžete prispieť.", "LabelRecordingPath": "Predvolené umiestnenie nahrávok:", "LabelRecordingPathHelp": "Uveďte predvolené umiestnenie pre ukladanie nahrávok. Ak je ponechané prázdne, použije sa priečinok s programovými dátami servera.", "LabelReleaseDate": "Dátum vydania:", "LabelRuntimeMinutes": "Dĺžka (minúty):", "LabelSaveLocalMetadata": "Uložiť obaly a metadáta do priečinka s médiami", "LabelScreensaver": "Šetrič obrazokvy:", - "LabelSeasonNumber": "Číslo sezóny:", + "LabelSeasonNumber": "Číslo série:", "LabelSelectUsers": "Zvoľte užívateľov:", "LabelSelectVersionToInstall": "Vyberte verziu, ktorú chcete nainštalovať:", "LabelSerialNumber": "Sériové číslo", @@ -490,7 +490,7 @@ "LabelTunerType": "Typ tunera:", "LabelType": "Typ:", "LabelUseNotificationServices": "Použiť nasledovné služby:", - "LabelUser": "Užívateľ:", + "LabelUser": "Používateľ:", "LabelUsername": "Používateľské meno:", "LabelValue": "Hodnota:", "LabelVersion": "Verzia:", @@ -503,7 +503,7 @@ "LabelffmpegPath": "Cesta k FFmpeg:", "Large": "Veľké", "LatestFromLibrary": "Najnovšie {0}", - "LearnHowYouCanContribute": "Zistite ako môžete prispieť.", + "LearnHowYouCanContribute": "Zistite, ako môžete prispieť.", "LibraryAccessHelp": "Zvoľte knižnice zdieľané s týmto používateľom. Administrátori budú schopní upraviť všetky priečinky použitím správcu metadát.", "Like": "Páči sa mi to", "Live": "Naživo", @@ -513,7 +513,7 @@ "ManageRecording": "Spravovať nahrávanie", "MarkPlayed": "Označiť ako prehrané", "MarkUnplayed": "Označiť ako neprehrané", - "MaxParentalRatingHelp": "Obsah s vyšším rodičovským hodnotením bude skrytý pre tohto užívateľa.", + "MaxParentalRatingHelp": "Obsah s vyšším rodičovským hodnotením bude skrytý pre tohto používateľa.", "MediaInfoAspectRatio": "Pomer strán", "MediaInfoBitDepth": "Bitová hĺbka", "MediaInfoChannels": "Kanály", @@ -546,8 +546,8 @@ "MessageInvalidUser": "Nesprávne meno alebo heslo. Skúste prosím znovu.", "MessageItemSaved": "Položka uložená.", "MessageItemsAdded": "Položky pridané.", - "MessageNoAvailablePlugins": "Žiadne dostupné rozšírenia.", - "MessageNoPluginsInstalled": "Nemáte nainštalované žiadne rozšírenia.", + "MessageNoAvailablePlugins": "Žiadne dostupné zásuvné moduly.", + "MessageNoPluginsInstalled": "Nemáte nainštalované žiadne zásuvné moduly.", "MessageNothingHere": "Nič tu nie je.", "MessagePleaseEnsureInternetMetadata": "Prosím, uistite sa, že sťahovanie internetových metadát je povolené.", "MessagePleaseWait": "Prosím počkajte. Toto môže chvíľu trvať.", @@ -569,7 +569,7 @@ "MySubtitles": "Moje titulky", "Name": "Meno", "Never": "Nikdy", - "NewCollection": "Nová zbierka", + "NewCollection": "Nová kolekcia", "NewCollectionNameExample": "Príklad: Kolekcia Star Wars", "NewEpisodes": "Nové epizódy", "NewEpisodesOnly": "Iba nové epizódy", @@ -620,8 +620,8 @@ "OptionDateAddedImportTime": "Podľa dátumu pridania do knižnice", "OptionDatePlayed": "Dátum prehrania", "OptionDescending": "Zostupne", - "OptionDisableUser": "Zakázať tohto užívateľa", - "OptionDisableUserHelp": "Ak možnosť nie je povolená, server nepovolí žiadne pripojenia od tohto užívateľa. Aktívne pripojenia budú ihneď ukončené.", + "OptionDisableUser": "Zakázať tohto používateľa", + "OptionDisableUserHelp": "Ak možnosť nie je povolená, server nepovolí žiadne pripojenia od tohto používateľa. Aktívne pripojenia budú ihneď ukončené.", "OptionDislikes": "Nepáči sa", "OptionDownloadArtImage": "Obal", "OptionDownloadBackImage": "Späť", @@ -725,7 +725,7 @@ "RefreshMetadata": "Obnoviť metadáta", "ReleaseDate": "Dátum vydania", "RememberMe": "Zapamätať si ma", - "RemoveFromCollection": "Odobrať zo zbierky", + "RemoveFromCollection": "Odobrať z kolekcie", "Repeat": "Opakovať", "RepeatAll": "Opakovať všetko", "RepeatOne": "Opakovať jedno", @@ -752,7 +752,7 @@ "SeriesSettings": "Nastavenia série", "ServerNameIsRestarting": "Jellyfin Server - {0} sa reštartuje.", "ServerNameIsShuttingDown": "Jellyfin Server - {0} sa vypína.", - "ServerRestartNeededAfterPluginInstall": "Po inštalácii rozšírenia bude potrebný reštart Jellyfin servera.", + "ServerRestartNeededAfterPluginInstall": "Po inštalácii zásuvného modulu bude potrebný reštart Jellyfin servera.", "ServerUpdateNeeded": "Tento Jellyfin server treba aktualizovať. Najnovšiu verziu nájdete na {0}", "Settings": "Nastavenia", "SettingsSaved": "Nastavenia uložené.", @@ -782,7 +782,7 @@ "TabCodecs": "Kodeky", "TabCollections": "Zbierky", "TabContainers": "Kontajnery", - "TabDashboard": "Prístrojová doska", + "TabDashboard": "Dashboard", "TabDevices": "Zariadenia", "TabEpisodes": "Epizódy", "TabFavorites": "Obľúbené", @@ -794,14 +794,14 @@ "TabMovies": "Filmy", "TabMusic": "Hudba", "TabMusicVideos": "Hudobné videá", - "TabMyPlugins": "Moje rozšírenia", + "TabMyPlugins": "Moje zásuvné moduly", "TabNetworks": "Siete", "TabNfoSettings": "NFO nastavenia", "TabNotifications": "Upozornenia", "TabOther": "Iné", "TabParentalControl": "Rodičovská kontrola", "TabPassword": "Heslo", - "TabPlugins": "Rozšírenia", + "TabPlugins": "Zásuvné moduly", "TabProfile": "Profil", "TabProfiles": "Profily", "TabRecordings": "Nahrávky", @@ -904,7 +904,7 @@ "HeaderStatus": "Stav", "LabelAccessEnd": "Koniec:", "LabelAccessStart": "Začiatok:", - "LabelAirsAfterSeason": "Vysielané po sezóne:", + "LabelAirsAfterSeason": "Vysielané po sérií:", "LabelAlbum": "Album:", "LabelCustomRating": "Vlastné hodnotenie:", "LabelDynamicExternalId": "{0} Id:", @@ -962,11 +962,11 @@ "HeaderTags": "Tagy", "HeaderVideoType": "Typ videa", "HeaderVideoTypes": "Typy videí", - "LabelAirsBeforeSeason": "Vysielané pred sezónou:", + "LabelAirsBeforeSeason": "Vysielané pred sériou:", "LabelAudio": "Zvuk:", "LabelBlockContentWithTags": "Blokovať položky s tagmi:", "LabelDisplayMode": "Režim zobrazenia:", - "LabelDisplaySpecialsWithinSeasons": "Zobraziť špeciálne epizódy v sezóne, v ktorej boli odvysielané", + "LabelDisplaySpecialsWithinSeasons": "Zobraziť špeciálne epizódy v sérií, v ktorej boli odvysielané", "Option3D": "3D", "OptionAlbum": "Album", "OptionBluray": "Blu-ray", @@ -977,7 +977,7 @@ "OptionDvd": "DVD", "OptionExtractChapterImage": "Povoliť extrakciu obrázkov z videa", "OptionHasSpecialFeatures": "Špeciálne fukncie", - "OptionHasTrailer": "Ukážka/Trailer", + "OptionHasTrailer": "Trailer", "OptionIsHD": "HD", "OptionIsSD": "SD", "OptionList": "Zoznam", @@ -1029,7 +1029,7 @@ "ThemeSongs": "Tématická hudba", "TabInfo": "Info", "TV": "TV", - "SkipEpisodesAlreadyInMyLibraryHelp": "Epizódy budú porovnané na základe čísla sezóny a epizódy, ak sú k dispozícii.", + "SkipEpisodesAlreadyInMyLibraryHelp": "Epizódy budú porovnané na základe čísla série a epizódy, ak sú k dispozícii.", "SimultaneousConnectionLimitHelp": "Maximálny povolený počet súčasných streamov. Zadajte 0 pre vypnutie obmedzenia.", "RepeatEpisodes": "Opakovanie epizód", "Record": "Nahrávať", @@ -1210,7 +1210,7 @@ "TitleHostingSettings": "Nastavenie hostingu", "Thumb": "Náhľad", "TheseSettingsAffectSubtitlesOnThisDevice": "Toto nastavenie ovplyvní titulky na tomto zariadení", - "TabNetworking": "Sieťovanie", + "TabNetworking": "Sieť", "TabDisplay": "Zobrazenie", "TabAlbumArtists": "Umelec albumu", "SystemDlnaProfilesHelp": "Systémové profily sú len na čítanie. Zmeny systémových profilov budú uložené do nového vlastné profilu.", @@ -1235,7 +1235,7 @@ "PreferEmbeddedTitlesOverFileNamesHelp": "Toto určuje východzí názov zobrazenia, pokiaľ nie sú k dispozícií internetové metadáta alebo lokálne metadáta.", "PreferEmbeddedTitlesOverFileNames": "Preferovať vložené názvy nad názvami súborov", "PleaseConfirmPluginInstallation": "Prosím, kliknite na OK pre potvrdenie, že ste prečítali text uvedený vyššie a chcete pokračovať v inštalácií zásuvného modulu.", - "PlaybackData": "Dáta prehrávania", + "PlaybackData": "Podrobnosti prehrávania", "PlayAllFromHere": "Prehrať všetko odtiaľto", "PasswordResetProviderHelp": "Zvoľte poskytovateľa obnovy hesla, ktorý bude použitý, keď používateľ požiada o obnovu hesla", "OptionThumbCard": "Náhľadové kartičky", @@ -1272,7 +1272,7 @@ "OptionAllowVideoPlaybackRemuxing": "Povoliť prehrávanie videa, ktoré vyžaduje konverziu bez opätovného enkódovania", "OptionAllowSyncTranscoding": "Povoliť sťahovanie a synchronizáciu medií, ktoré vyžadujú transkódovanie", "OptionAllowMediaPlaybackTranscodingHelp": "Obmedzenie prístupu ku transkódovaniu môže spôsobiť zlyhania prehrávania v Jellyfin aplikáciách kvôli nepodporovaným formátom medií.", - "MessageNoTrailersFound": "Ukážky neboli nájdené. Nainštalujte Ukážkový kanál pre rozšírenie vášho filmového zážitku pridaním knižnice ukážok z internetu.", + "MessageNoTrailersFound": "Neboli nájdené žiadne trailery. Nainštalujte Trailer kanál pre rozšírenie vášho filmového zážitku pridaním knižnice trailerov z internetu.", "LanNetworksHelp": "Zoznam IP adries alebo IP/netmask záznamov pre všetky siete oddelené čiarkami ktoré budú považované za lokálnu sieť pri vynucovaní obmedzenia šírky pásma. Pokiaľ je toto nastavené, všetky ostatné IP adresy budú považované za vonkajšiu sieť a budú podliehať obmedzeniam šírky pásma vonkajšej siete. Pokiaľ pole ostane prázdne, podsieť serveru bude považovaná za lokálnu sieť.", "LabelUserAgent": "User agent:", "LabelEnableBlastAliveMessagesHelp": "Povolte v prípade, že server nie je viditeľný inými UPnP zariadeniami na vašej sieti.", From c6177fb7fd0fb1746e8f9957cb391c3ea7b33872 Mon Sep 17 00:00:00 2001 From: ylzhan Date: Sun, 19 Jan 2020 20:49:35 +0000 Subject: [PATCH 59/70] Translated using Weblate (Turkish) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/tr/ --- src/strings/tr.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/strings/tr.json b/src/strings/tr.json index eae0b419c9..d6df5a73a2 100644 --- a/src/strings/tr.json +++ b/src/strings/tr.json @@ -34,7 +34,7 @@ "ButtonSend": "Gönder", "ButtonSettings": "Ayarlar", "ButtonSignIn": "Giriş Yapın", - "ButtonSignOut": "Sign out", + "ButtonSignOut": "Çıkış yapın", "ButtonSort": "Sırala", "ButtonStop": "Durdur", "ButtonSubtitles": "Altyazılar", @@ -693,5 +693,13 @@ "HeaderSortBy": "Sırala", "HeaderShutdown": "Kapat", "HeaderSettings": "Ayarlar", - "LabelLogs": "Günlük:" + "LabelLogs": "Günlük:", + "HeaderSelectMetadataPathHelp": "İçinde meta veri depolamak istediğiniz yola göz atın veya bu yolu girin. Klasörün yazılabilir olması gerekir.", + "HeaderResponseProfileHelp": "Yanıt profilleri, belirli media türlerini oynatırken aygıta gönderilen bilgileri özelleştirmek için bir yol sağlar.", + "HeaderProfileServerSettingsHelp": "Bu değerler Jellyfin Server'ın kendini cihaza nasıl sunacağını kontrol eder.", + "HeaderPlayOn": "Üzerinde oyna", + "HeaderPaths": "Yollar", + "HeaderKodiMetadataHelp": "NFO meta verilerini açmak yada kapatmak için, meta verileri bölümünü kullanın ve her tür medya için seçeneklerinizi ayarlayın.", + "HeaderInstantMix": "Ani mix", + "ButtonSplit": "Ayır" } From 8152c95bfae090efa80d3e82139e21851151a1aa Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 21 Jan 2020 00:03:35 +0900 Subject: [PATCH 60/70] fix play button border for mobile layout --- src/assets/css/librarybrowser.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index af106959e0..75e13ca757 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -521,8 +521,7 @@ top: 50%; left: 50%; margin: -2.2em 0 0 -2.2em; - border: 2.7px solid rgba(255, 255, 255, .6); - padding: .38em !important; + padding: 0.4em !important; color: rgba(255, 255, 255, .76) } From 736086d068597a76715d539a1f8a01830e32d1e7 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Mon, 20 Jan 2020 19:57:15 +0100 Subject: [PATCH 61/70] Use dist version of flv.js --- src/bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle.js b/src/bundle.js index 54623fab74..28626c2a02 100644 --- a/src/bundle.js +++ b/src/bundle.js @@ -17,7 +17,7 @@ _define("fetch", function() { }); // flvjs -var flvjs = require("flv.js").default; +var flvjs = require("flv.js/dist/flv").default; _define("flvjs", function() { return flvjs; }); From 361a6acc96d1d5b0cff926ceea4ce7e9d4ee9c6a Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Mon, 20 Jan 2020 21:40:42 +0100 Subject: [PATCH 62/70] Safari supports AC-3 --- src/scripts/browserdeviceprofile.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/scripts/browserdeviceprofile.js b/src/scripts/browserdeviceprofile.js index 18b85a6dc0..31cd44806a 100644 --- a/src/scripts/browserdeviceprofile.js +++ b/src/scripts/browserdeviceprofile.js @@ -77,10 +77,6 @@ define(['browser'], function (browser) { return true; } - if (browser.osx || browser.iOS) { - return false; - } - return videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, ''); } From 143cd2bfad3eb6ff4ad7d9b7aaccabace27fb87e Mon Sep 17 00:00:00 2001 From: Samuel Date: Mon, 20 Jan 2020 21:52:47 -0500 Subject: [PATCH 63/70] Update moviegenres.js --- src/controllers/movies/moviegenres.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js index e51274d254..6d32e4ab2a 100644 --- a/src/controllers/movies/moviegenres.js +++ b/src/controllers/movies/moviegenres.js @@ -114,7 +114,10 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader shape: getPortraitShape(), scalable: true, overlayMoreButton: true, - allowBottomPadding: false + allowBottomPadding: true, + showTitle: true, + centerText: true, + showYear: true }); } if (result.Items.length >= query.Limit) { From 50d6864a681327b56f6397f7b2cbbf441daa31cf Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Thu, 9 Jan 2020 19:35:19 +0100 Subject: [PATCH 64/70] Revert vendor prefix removal --- src/assets/css/dashboard.css | 49 ++++- src/assets/css/fonts.css | 1 + src/assets/css/librarybrowser.css | 129 +++++++++-- src/assets/css/metadataeditor.css | 4 + src/assets/css/scrollstyles.css | 17 +- src/assets/css/site.css | 6 + src/assets/css/videoosd.css | 67 +++++- src/components/cardbuilder/card.css | 9 +- src/components/dialogHelper/dialoghelper.css | 1 + src/components/filterdialog/style.css | 1 + src/components/homesections/homesections.css | 2 + src/components/htmlvideoplayer/style.css | 1 + src/components/images/style.css | 12 ++ src/components/indicators/indicators.css | 4 + src/components/loading/loading.css | 204 +++++++++++++++++- src/components/navdrawer/navdrawer.css | 11 + .../remotecontrol/remotecontrol.css | 48 ++++- src/components/slideshow/style.css | 3 + src/components/subtitlesync/subtitlesync.css | 2 + src/components/upnextdialog/upnextdialog.css | 5 + src/elements/emby-button/emby-button.css | 10 + src/elements/emby-checkbox/emby-checkbox.css | 5 +- src/elements/emby-input/emby-input.css | 3 + src/elements/emby-radio/emby-radio.css | 7 + src/elements/emby-select/emby-select.css | 5 + src/elements/emby-slider/emby-slider.css | 16 +- src/elements/emby-textarea/emby-textarea.css | 1 + src/elements/emby-toggle/emby-toggle.css | 8 + src/themes/appletv/theme.css | 20 ++ src/themes/blueradiance/theme.css | 23 +- src/themes/dark/theme.css | 14 +- src/themes/light/theme.css | 12 ++ src/themes/purplehaze/theme.css | 23 +- src/themes/wmc/theme.css | 26 ++- 34 files changed, 698 insertions(+), 51 deletions(-) diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index d4928db691..1c69dfccb4 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -1,6 +1,7 @@ .dashboardColumn, .dashboardSections { - flex-direction: column; + -webkit-box-orient: vertical; + -webkit-box-direction: normal } .dashboardFooter { @@ -14,6 +15,8 @@ progress { appearance: none; + -moz-appearance: none; + -webkit-appearance: none; margin: 0; background: #ccc !important } @@ -73,17 +76,23 @@ progress[aria-valuenow]:before { div[data-role=controlgroup] a[data-role=button] { display: inline-block !important; margin: 0 !important; + -webkit-box-shadow: none !important; box-shadow: none !important; + -webkit-border-radius: 0; border-radius: 0 } div[data-role=controlgroup] a[data-role=button]:first-child { + -webkit-border-bottom-left-radius: .3125em; border-bottom-left-radius: .3125em; + -webkit-border-top-left-radius: .3125em; border-top-left-radius: .3125em } div[data-role=controlgroup] a[data-role=button]:last-child { + -webkit-border-bottom-right-radius: .3125em; border-bottom-right-radius: .3125em; + -webkit-border-top-right-radius: .3125em; border-top-right-radius: .3125em } @@ -137,14 +146,23 @@ div[data-role=controlgroup] a.ui-btn-active { } .dashboardSections { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-flex-direction: column; flex-direction: column } .dashboardColumn { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-flex-direction: column; flex-direction: column; + -webkit-flex-shrink: 0; flex-shrink: 0; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1 } @@ -153,6 +171,7 @@ div[data-role=controlgroup] a.ui-btn-active { } .dashboardSection { + -webkit-flex-shrink: 0; flex-shrink: 0; margin: 0 0 2em } @@ -168,7 +187,11 @@ div[data-role=controlgroup] a.ui-btn-active { @media all and (min-width:70em) { .dashboardSections { + -webkit-flex-wrap: wrap; flex-wrap: wrap; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -webkit-flex-direction: row; flex-direction: row } @@ -273,6 +296,7 @@ div[data-role=controlgroup] a.ui-btn-active { } .sessionNowPlayingContent { + -webkit-background-size: cover; background-size: cover; background-repeat: no-repeat; background-position: center center; @@ -371,6 +395,7 @@ div[data-role=controlgroup] a.ui-btn-active { } .disabledUser { + -webkit-filter: grayscale(100%); filter: grayscale(100%) } @@ -391,7 +416,9 @@ div[data-role=controlgroup] a.ui-btn-active { } a[data-role=button] { - background-clip: padding-box; + -webkit-font-smoothing: antialiased; + -webkit-user-select: none; + -webkit-background-clip: padding-box; cursor: pointer !important; font-family: inherit !important; font-weight: 500 !important; @@ -403,21 +430,37 @@ a[data-role=button] { background: #292929 !important; } -@keyframes rotating { +@-webkit-keyframes rotating { from { + -webkit-transform: rotate(0); transform: rotate(0) } to { + -webkit-transform: rotate(360deg); + transform: rotate(360deg) + } +} + +@keyframes rotating { + from { + -webkit-transform: rotate(0); + transform: rotate(0) + } + + to { + -webkit-transform: rotate(360deg); transform: rotate(360deg) } } .rotatingCircle { + -webkit-animation: rotating 2s linear infinite; animation: rotating 2s linear infinite } .pluginPreviewImg { + -webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37) } diff --git a/src/assets/css/fonts.css b/src/assets/css/fonts.css index da5515fc1e..12f1eaf4b7 100644 --- a/src/assets/css/fonts.css +++ b/src/assets/css/fonts.css @@ -4,6 +4,7 @@ html { html { font-size: 93%; + -webkit-text-size-adjust: 100%; text-size-adjust: 100%; } diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index b9f406bc0d..c03cc2691f 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -15,6 +15,7 @@ .headerSelectedPlayer, .itemMiscInfo, .navMenuOptionText { + -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden } @@ -47,6 +48,8 @@ z-index: 1; margin: 0 !important; top: 6.9em !important; + -webkit-transition: -webkit-transform .2s ease-out; + -o-transition: transform .2s ease-out; transition: transform .2s ease-out } @@ -55,14 +58,17 @@ } .headerUserImage { + -webkit-background-size: contain; background-size: contain; background-repeat: no-repeat; background-position: center center; + -webkit-border-radius: 100em; border-radius: 100em; display: inline-block } .headerUserButtonRound div { + -webkit-border-radius: 100em; border-radius: 100em; background-size: cover; background-repeat: no-repeat; @@ -70,6 +76,7 @@ } .headerButton { + -webkit-flex-shrink: 0; flex-shrink: 0 } @@ -83,25 +90,34 @@ } .pageTitle { + display: -webkit-inline-box; + display: -webkit-inline-flex; display: inline-flex; margin: .3em 0 0 .5em; height: 1.7em; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; + -webkit-flex-shrink: 1; flex-shrink: 1 } .headerLeft, .skinHeader { - display: flex; + display: -webkit-box; + display: -webkit-flex } .detailButton-mobile, .skinHeader { - flex-direction: column; + -webkit-flex-direction: column; + -webkit-box-orient: vertical; + -webkit-box-direction: normal } .pageTitleWithLogo { background-position: left center; + -webkit-background-size: contain; background-size: contain; background-repeat: no-repeat; width: 13.2em @@ -121,7 +137,7 @@ .headerLeft, .headerRight { - justify-content: center; + -webkit-box-align: center } .hiddenViewMenuBar .skinHeader { @@ -134,7 +150,10 @@ .headerLeft { display: flex; + -webkit-align-items: center; align-items: center; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1; overflow: hidden; justify-content: flex-start; @@ -145,8 +164,13 @@ } .headerRight { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-align-items: center; align-items: center; + -webkit-box-pack: end; + -webkit-justify-content: flex-end; justify-content: flex-end } @@ -155,19 +179,27 @@ } .navMenuOption { + display: -webkit-box !important; + display: -webkit-flex !important; display: flex !important; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; text-decoration: none; color: inherit; padding: .9em 0 .9em 2.4em !important; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1; font-weight: 400 !important; margin: 0 !important; + -webkit-border-radius: 0 !important; border-radius: 0 !important } .navMenuOptionIcon { margin-right: 1.2em; + -webkit-flex-shrink: 0; flex-shrink: 0 } @@ -181,6 +213,8 @@ } .dashboardDocument .skinBody { + -webkit-transition: left ease-in-out .3s, padding ease-in-out .3s; + -o-transition: left ease-in-out .3s, padding ease-in-out .3s; transition: left ease-in-out .3s, padding ease-in-out .3s; position: absolute; top: 0; @@ -210,7 +244,9 @@ z-index: inherit !important; left: 0 !important; top: 0 !important; + -webkit-transform: none !important; transform: none !important; + -webkit-box-shadow: none !important; box-shadow: none !important; width: 20.205em !important; font-size: 94% @@ -247,9 +283,14 @@ } .headerTabs { + -webkit-align-self: center; align-self: center; width: auto; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center; margin-top: -3.34em; position: relative; @@ -307,6 +348,8 @@ } .flexPageTabContent.is-active { + display: -webkit-box !important; + display: -webkit-flex !important; display: flex !important } @@ -322,6 +365,7 @@ margin: 1.5em 0; background: #222; padding: .8em .8em .8em 3em; + -webkit-border-radius: .3em; border-radius: .3em; position: relative } @@ -380,6 +424,7 @@ } .itemBackdrop { + -webkit-background-size: cover; background-size: cover; background-repeat: no-repeat; background-position: center; @@ -443,15 +488,15 @@ } .detailImageContainer { - margin: 1.25em 0; - position: sticky; - top: 15%; - float: left; - width: 22.786458333333332vw; + width: 280px; + margin-right: 2em; + flex-shrink: 0; } .detailPagePrimaryContent { position: relative; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1 } @@ -459,8 +504,9 @@ width: 25em; height: 9.375em; position: absolute; - top: 14.5%; - right: 10.5%; + top: 13.5%; + right: 19.5%; + -webkit-background-size: contain; background-size: contain } @@ -489,8 +535,13 @@ } .itemDetailImage { - width: 100% !important; - box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); + width: 100%; + -webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); + box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37) +} + +.thumbDetailImageContainer { + width: 400px } @media all and (max-width:62.5em) { @@ -503,6 +554,19 @@ } } +@media all and (min-width:62.5em) { + .itemBackdrop { + display: none + } + + .detailPagePrimaryContainer { + display: -webkit-box; + display: -webkit-flex; + display: flex; + margin-bottom: 3em + } +} + @media all and (max-width:75em) { .lnkSibling { display: none !important @@ -557,7 +621,8 @@ .detailButton-mobile, .mainDetailButtons { - display: flex; + display: -webkit-box; + display: -webkit-flex } .itemName { @@ -578,7 +643,10 @@ .mainDetailButtons { display: flex; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; + -webkit-flex-wrap: wrap; flex-wrap: wrap; margin: 1em 0; } @@ -586,6 +654,7 @@ .recordingFields button { margin-left: 0; margin-right: .5em; + -webkit-flex-shrink: 0; flex-shrink: 0 } @@ -596,7 +665,11 @@ .detailButton-mobile { display: flex; flex-direction: column; + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; margin: 0 !important; padding: .5em .7em !important @@ -628,9 +701,18 @@ } .detailButton-mobile-content { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -webkit-flex-direction: column; flex-direction: column; + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center } @@ -684,14 +766,21 @@ } .itemMiscInfo { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-flex-wrap: wrap; flex-wrap: wrap; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center } @media all and (max-width:31.25em) { .mobileDetails .itemMiscInfo { text-align: center; + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center } @@ -781,6 +870,7 @@ } .btnSyncComplete i { + -webkit-border-radius: 100em; border-radius: 100em } @@ -789,9 +879,14 @@ } .mediaInfoIcons { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; margin: 1em 0; + -webkit-flex-wrap: wrap; flex-wrap: wrap } @@ -829,6 +924,7 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards { .sectionTitleButton { margin-left: 1.5em !important; + -webkit-flex-shrink: 0; flex-shrink: 0 } @@ -838,17 +934,22 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards { .sectionTitleIconButton { margin-left: 1.5em !important; + -webkit-flex-shrink: 0; flex-shrink: 0; font-size: 84% !important; padding: .5em !important } .horizontalItemsContainer { + display: -webkit-box; + display: -webkit-flex; display: flex } .sectionTitleTextButton { margin: 0 !important; + display: -webkit-inline-box !important; + display: -webkit-inline-flex !important; display: inline-flex !important; color: inherit !important } @@ -920,6 +1021,8 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards { } .itemsViewSettingsContainer { + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center } diff --git a/src/assets/css/metadataeditor.css b/src/assets/css/metadataeditor.css index c5de6f3efe..542c7c8f2b 100644 --- a/src/assets/css/metadataeditor.css +++ b/src/assets/css/metadataeditor.css @@ -28,13 +28,17 @@ .jstree-wholerow-hovered { background: #38c !important; + -webkit-border-radius: 0 !important; border-radius: 0 !important; + -webkit-box-shadow: none !important; box-shadow: none !important } .jstree-default .jstree-hovered { background: 0 0 !important; + -webkit-border-radius: 0 !important; border-radius: 0 !important; + -webkit-box-shadow: none !important; box-shadow: none !important; color: #fff !important } diff --git a/src/assets/css/scrollstyles.css b/src/assets/css/scrollstyles.css index 69039ce341..aa2f7dafad 100644 --- a/src/assets/css/scrollstyles.css +++ b/src/assets/css/scrollstyles.css @@ -1,5 +1,6 @@ .scrollX { overflow-x: auto; + -webkit-overflow-scrolling: touch; overflow-y: hidden; white-space: nowrap; } @@ -9,11 +10,13 @@ } .hiddenScrollX, .layout-tv .scrollX { - scrollbar-width: none; + -ms-overflow-style: none; + /* Can't do this because it not only hides the scrollbar, but also prevents scrolling */ + /*overflow: -moz-scrollbars-none;*/ } .hiddenScrollX-forced { - scrollbar-width: none; + overflow: -moz-scrollbars-none; } .hiddenScrollX::-webkit-scrollbar, .layout-tv .scrollX::-webkit-scrollbar { @@ -23,24 +26,28 @@ .scrollY { overflow-y: auto; + -webkit-overflow-scrolling: touch; overflow-x: hidden; } .smoothScrollY { overflow-y: auto; + -webkit-overflow-scrolling: touch; overflow-x: hidden; scroll-behavior: smooth; } .hiddenScrollY, .layout-tv .smoothScrollY { - scrollbar-width: none; + -ms-overflow-style: none; + /* Can't do this because it not only hides the scrollbar, but also prevents scrolling */ + /*overflow: -moz-scrollbars-none;*/ } .hiddenScrollY-forced { - scrollbar-width: none; + overflow: -moz-scrollbars-none; } .hiddenScrollY::-webkit-scrollbar, .layout-tv .smoothScrollY::-webkit-scrollbar, .layout-tv .scrollY::-webkit-scrollbar { width: 0 !important; display: none; -} +} \ No newline at end of file diff --git a/src/assets/css/site.css b/src/assets/css/site.css index 6491799117..292fc67454 100644 --- a/src/assets/css/site.css +++ b/src/assets/css/site.css @@ -20,12 +20,18 @@ html { .layout-mobile, .layout-tv { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none } body { overflow-x: hidden; background-color: transparent !important; + -webkit-font-smoothing: antialiased } .mainAnimatedPage { diff --git a/src/assets/css/videoosd.css b/src/assets/css/videoosd.css index f20abf9d07..f9c4798e97 100644 --- a/src/assets/css/videoosd.css +++ b/src/assets/css/videoosd.css @@ -1,6 +1,8 @@ .chapterThumbTextContainer, .videoOsdBottom { - user-select: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none } .osdPoster img, @@ -12,10 +14,13 @@ } .osdHeader { + -webkit-transition: opacity .3s ease-out; + -o-transition: opacity .3s ease-out; transition: opacity .3s ease-out; position: relative; z-index: 1; background: rgba(0, 0, 0, 0.7) !important; + -webkit-backdrop-filter: none !important; backdrop-filter: none !important; color: #eee !important; } @@ -29,13 +34,17 @@ } .chapterThumbContainer { + -webkit-box-shadow: 0 0 1.9vh #000; box-shadow: 0 0 1.9vh #000; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1; position: relative } .chapterThumb { background-position: center center; + -webkit-background-size: contain; background-size: contain; background-repeat: no-repeat; border: 0; @@ -81,12 +90,20 @@ position: fixed; background-color: rgba(0, 0, 0, 0.7); padding: 1%; + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -webkit-flex-direction: row; flex-direction: row; will-change: opacity; + -webkit-transition: opacity 0.3s ease-out; + -o-transition: opacity 0.3s ease-out; transition: opacity 0.3s ease-out; color: #fff; - user-select: none + user-select: none; + -webkit-touch-callout: none } .videoOsdBottom-hidden { @@ -94,35 +111,49 @@ } .osdControls { + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1 } .videoOsdBottom .buttons { padding: .25em 0 0; + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-flex-wrap: wrap; flex-wrap: wrap; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center } .osdVolumeSliderContainer { width: 9em; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1 } .osdMediaInfo, .volumeButtons { - display: flex; - align-items: center; + display: -webkit-box; + display: -webkit-flex; + -webkit-box-align: center } .volumeButtons { margin: 0 .5em 0 auto; display: flex; + -webkit-align-items: center; align-items: center } .osdTimeText { margin-left: 1em; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none } @@ -136,10 +167,15 @@ position: absolute; height: auto; width: 100%; + -webkit-box-shadow: 0 0 1.9vh #000; box-shadow: 0 0 1.9vh #000; border: .08em solid #222; user-drag: none; - user-select: none + user-select: none; + -moz-user-select: none; + -webkit-user-drag: none; + -webkit-user-select: none; + -ms-user-select: none } .osdTitle, @@ -149,6 +185,7 @@ .osdMediaInfo { display: flex; + -webkit-align-items: center; align-items: center } @@ -157,14 +194,23 @@ } .osdTextContainer { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; margin-bottom: .7em; padding-left: .5em } .osdMainTextContainer { + -webkit-box-align: baseline; + -webkit-align-items: baseline; align-items: baseline } @@ -172,13 +218,12 @@ margin-left: auto; } -@keyframes spin { - 100% { - transform:rotate(360deg); - } -} - +@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } } +@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } } +@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } } .osdMediaStatus .animate { + -webkit-animation:spin 4s linear infinite; + -moz-animation:spin 4s linear infinite; animation:spin 4s linear infinite; } diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 5520ce2c7e..e63b9a4bb1 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -18,6 +18,7 @@ button { padding: 0; display: block; color: inherit !important; + -webkit-tap-highlight-color: rgba(0,0,0,0); outline: none !important; cursor: pointer; contain: layout style; @@ -79,9 +80,10 @@ button { margin: 0.6em; transition: none; border: 0 solid transparent; + /* These both are needed in case cardBox is a button */ + -webkit-tap-highlight-color: rgba(0,0,0,0); outline: none !important; - contain: layout; - contain: style; + contain: layout style; } .card.show-focus:not(.show-animation) .cardBox { @@ -146,6 +148,7 @@ button { background-size: cover; background-repeat: no-repeat; background-position: center center; + display: -webkit-flex; display: flex; align-items: center; justify-content: center; @@ -179,6 +182,7 @@ button { margin: 0 !important; /* Needed in safari */ height: 100%; + -webkit-tap-highlight-color: rgba(0,0,0,0); outline: none !important; contain: strict; } @@ -342,6 +346,7 @@ button { border: 0 !important; padding: 0 !important; cursor: pointer; + -webkit-tap-highlight-color: rgba(0,0,0,0); outline: none !important; color: inherit; vertical-align: middle; diff --git a/src/components/dialogHelper/dialoghelper.css b/src/components/dialogHelper/dialoghelper.css index aa4145e016..2cc20b5ff2 100644 --- a/src/components/dialogHelper/dialoghelper.css +++ b/src/components/dialogHelper/dialoghelper.css @@ -16,6 +16,7 @@ .dialog { margin: 0; border-radius: .2em; + -webkit-font-smoothing: antialiased; border: 0; padding: 0; will-change: transform, opacity; diff --git a/src/components/filterdialog/style.css b/src/components/filterdialog/style.css index 989b7c1245..9851c2d7b9 100644 --- a/src/components/filterdialog/style.css +++ b/src/components/filterdialog/style.css @@ -5,6 +5,7 @@ margin-top: 0 !important; margin-bottom: 0 !important; margin-right: 0 !important; + -webkit-border-radius: 0 !important; border-radius: 0 !important; max-height: none !important; max-width: none !important diff --git a/src/components/homesections/homesections.css b/src/components/homesections/homesections.css index 5df2440f82..45df67c482 100644 --- a/src/components/homesections/homesections.css +++ b/src/components/homesections/homesections.css @@ -13,11 +13,13 @@ .homeLibraryIcon { margin-left: .5em; margin-right: .5em; + -webkit-flex-shrink: 0; flex-shrink: 0 } .homeLibraryText { white-space: nowrap; + -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden } diff --git a/src/components/htmlvideoplayer/style.css b/src/components/htmlvideoplayer/style.css index e1875ff332..32c090eeae 100644 --- a/src/components/htmlvideoplayer/style.css +++ b/src/components/htmlvideoplayer/style.css @@ -42,6 +42,7 @@ video::-webkit-media-controls { .htmlvideoplayer::cue { background-color: transparent; text-shadow: 0.14em 0.14em 0.14em rgba(0, 0, 0, 1); + -webkit-font-smoothing: antialiased; font-family: inherit; } diff --git a/src/components/images/style.css b/src/components/images/style.css index 06fbf1f9cf..5cf39c1e4b 100644 --- a/src/components/images/style.css +++ b/src/components/images/style.css @@ -18,9 +18,21 @@ .lazy-image-fadein { opacity: 0; + -webkit-animation-duration: .8s; + -moz-animation-duration: .8s; + -o-animation-duration: .8s; animation-duration: .8s; + -webkit-animation-name: popInAnimation; + -moz-animation-name: popInAnimation; + -o-animation-name: popInAnimation; animation-name: popInAnimation; + -webkit-animation-fill-mode: forwards; + -moz-animation-fill-mode: forwards; + -o-animation-fill-mode: forwards; animation-fill-mode: forwards; + -webkit-animation-timing-function: cubic-bezier(0,0,.5,1); + -moz-animation-timing-function: cubic-bezier(0,0,.5,1); + -o-animation-timing-function: cubic-bezier(0,0,.5,1); animation-timing-function: cubic-bezier(0,0,.5,1); } diff --git a/src/components/indicators/indicators.css b/src/components/indicators/indicators.css index b0d0119c05..c2d089e1af 100644 --- a/src/components/indicators/indicators.css +++ b/src/components/indicators/indicators.css @@ -14,6 +14,7 @@ .indicator { border-radius: 100em; + display: -webkit-flex; display: flex; align-items: center; justify-content: center; @@ -42,6 +43,7 @@ .countIndicator { border-radius: 100em; + display: -webkit-flex; display: flex; align-items: center; justify-content: center; @@ -53,6 +55,7 @@ .playedIndicator { border-radius: 100em; + display: -webkit-flex; display: flex; align-items: center; justify-content: center; @@ -64,6 +67,7 @@ .videoIndicator { background: #444; border-radius: 100em; + display: -webkit-flex; display: flex; align-items: center; justify-content: center; diff --git a/src/components/loading/loading.css b/src/components/loading/loading.css index e3f10c0e2e..6d8472fc15 100644 --- a/src/components/loading/loading.css +++ b/src/components/loading/loading.css @@ -7,11 +7,20 @@ .mdlSpinnerActive { display: inline-block; + -webkit-animation: mdl-spinner__container-rotate 1568.23529412ms linear infinite; animation: mdl-spinner__container-rotate 1568.23529412ms linear infinite; } +@-webkit-keyframes mdl-spinner__container-rotate { + to { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} + @keyframes mdl-spinner__container-rotate { to { + -webkit-transform: rotate(360deg); transform: rotate(360deg); } } @@ -28,6 +37,7 @@ } .mdl-spinner__layer-1-active { + -webkit-animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; } @@ -36,6 +46,7 @@ } .mdl-spinner__layer-2-active { + -webkit-animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; } @@ -44,6 +55,7 @@ } .mdl-spinner__layer-3-active { + -webkit-animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; } @@ -52,39 +64,90 @@ } .mdl-spinner__layer-4-active { + -webkit-animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; animation: mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both, mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; } -@keyframes mdl-spinner__fill-unfill-rotate { +@-webkit-keyframes mdl-spinner__fill-unfill-rotate { 12.5% { + -webkit-transform: rotate(135deg); transform: rotate(135deg); } 25% { + -webkit-transform: rotate(270deg); transform: rotate(270deg); } 37.5% { + -webkit-transform: rotate(405deg); transform: rotate(405deg); } 50% { + -webkit-transform: rotate(540deg); transform: rotate(540deg); } 62.5% { + -webkit-transform: rotate(675deg); transform: rotate(675deg); } 75% { + -webkit-transform: rotate(810deg); transform: rotate(810deg); } 87.5% { + -webkit-transform: rotate(945deg); transform: rotate(945deg); } to { + -webkit-transform: rotate(1080deg); + transform: rotate(1080deg); + } +} + +@keyframes mdl-spinner__fill-unfill-rotate { + 12.5% { + -webkit-transform: rotate(135deg); + transform: rotate(135deg); + } + + 25% { + -webkit-transform: rotate(270deg); + transform: rotate(270deg); + } + + 37.5% { + -webkit-transform: rotate(405deg); + transform: rotate(405deg); + } + + 50% { + -webkit-transform: rotate(540deg); + transform: rotate(540deg); + } + + 62.5% { + -webkit-transform: rotate(675deg); + transform: rotate(675deg); + } + + 75% { + -webkit-transform: rotate(810deg); + transform: rotate(810deg); + } + + 87.5% { + -webkit-transform: rotate(945deg); + transform: rotate(945deg); + } + + to { + -webkit-transform: rotate(1080deg); transform: rotate(1080deg); } } @@ -98,6 +161,32 @@ * - https://github.com/Polymer/paper-spinner/issues/9 * - https://code.google.com/p/chromium/issues/detail?id=436255 */ +@-webkit-keyframes mdl-spinner__layer-1-fade-in-out { + from { + opacity: 0.99; + } + + 25% { + opacity: 0.99; + } + + 26% { + opacity: 0; + } + + 89% { + opacity: 0; + } + + 90% { + opacity: 0.99; + } + + 100% { + opacity: 0.99; + } +} + @keyframes mdl-spinner__layer-1-fade-in-out { from { opacity: 0.99; @@ -124,6 +213,28 @@ } } +@-webkit-keyframes mdl-spinner__layer-2-fade-in-out { + from { + opacity: 0; + } + + 15% { + opacity: 0; + } + + 25% { + opacity: 0.99; + } + + 50% { + opacity: 0.99; + } + + 51% { + opacity: 0; + } +} + @keyframes mdl-spinner__layer-2-fade-in-out { from { opacity: 0; @@ -146,6 +257,28 @@ } } +@-webkit-keyframes mdl-spinner__layer-3-fade-in-out { + from { + opacity: 0; + } + + 40% { + opacity: 0; + } + + 50% { + opacity: 0.99; + } + + 75% { + opacity: 0.99; + } + + 76% { + opacity: 0; + } +} + @keyframes mdl-spinner__layer-3-fade-in-out { from { opacity: 0; @@ -168,6 +301,28 @@ } } +@-webkit-keyframes mdl-spinner__layer-4-fade-in-out { + from { + opacity: 0; + } + + 65% { + opacity: 0; + } + + 75% { + opacity: 0.99; + } + + 90% { + opacity: 0.99; + } + + 100% { + opacity: 0; + } +} + @keyframes mdl-spinner__layer-4-fade-in-out { from { opacity: 0; @@ -211,6 +366,7 @@ border-color: inherit; border-bottom-color: transparent !important; border-radius: 50%; + -webkit-animation: none; animation: none; position: absolute; top: 0; @@ -221,47 +377,91 @@ .mdl-spinner__circleLeft { border-right-color: transparent !important; + -webkit-transform: rotate(129deg); transform: rotate(129deg); } .mdl-spinner__circleLeft-active { + -webkit-animation: mdl-spinner__left-spin 1333ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; animation: mdl-spinner__left-spin 1333ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; } .mdl-spinner__circleRight { left: -100%; border-left-color: transparent !important; + -webkit-transform: rotate(-129deg); transform: rotate(-129deg); } .mdl-spinner__circleRight-active { + -webkit-animation: mdl-spinner__right-spin 1333ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; animation: mdl-spinner__right-spin 1333ms cubic-bezier(0.4, 0, 0.2, 1) infinite both; } -@keyframes mdl-spinner__left-spin { +@-webkit-keyframes mdl-spinner__left-spin { from { + -webkit-transform: rotate(130deg); transform: rotate(130deg); } 50% { + -webkit-transform: rotate(-5deg); transform: rotate(-5deg); } to { + -webkit-transform: rotate(130deg); transform: rotate(130deg); } } +@keyframes mdl-spinner__left-spin { + from { + -webkit-transform: rotate(130deg); + transform: rotate(130deg); + } + + 50% { + -webkit-transform: rotate(-5deg); + transform: rotate(-5deg); + } + + to { + -webkit-transform: rotate(130deg); + transform: rotate(130deg); + } +} + +@-webkit-keyframes mdl-spinner__right-spin { + from { + -webkit-transform: rotate(-130deg); + transform: rotate(-130deg); + } + + 50% { + -webkit-transform: rotate(5deg); + transform: rotate(5deg); + } + + to { + -webkit-transform: rotate(-130deg); + transform: rotate(-130deg); + } +} + @keyframes mdl-spinner__right-spin { from { + -webkit-transform: rotate(-130deg); transform: rotate(-130deg); } 50% { + -webkit-transform: rotate(5deg); transform: rotate(5deg); } to { + -webkit-transform: rotate(-130deg); transform: rotate(-130deg); } } diff --git a/src/components/navdrawer/navdrawer.css b/src/components/navdrawer/navdrawer.css index 5d63e150d1..f774c6919f 100644 --- a/src/components/navdrawer/navdrawer.css +++ b/src/components/navdrawer/navdrawer.css @@ -9,20 +9,29 @@ .touch-menu-la { background-color: #FFF; will-change: transform; + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-transition: -webkit-transform ease-out 40ms, left ease-out 260ms; + -o-transition: transform ease-out 40ms, left ease-out 260ms; transition: transform ease-out 40ms, left ease-out 260ms; z-index: 1099 } .touch-menu-la.transition { + -webkit-transition: -webkit-transform ease-out 240ms, left ease-out 260ms; + -o-transition: transform ease-out 240ms, left ease-out 260ms; transition: transform ease-out 240ms, left ease-out 260ms } .drawer-open { + -webkit-box-shadow: 2px 0 12px rgba(0, 0, 0, .4); box-shadow: 2px 0 12px rgba(0, 0, 0, .4) } .scrollContainer { + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1 } @@ -32,6 +41,8 @@ background-color: #000; opacity: 0; z-index: 1098; + -webkit-transition: opacity ease-in-out .38s, visibility ease-in-out .38s; + -o-transition: opacity ease-in-out .38s, visibility ease-in-out .38s; transition: opacity ease-in-out .38s, visibility ease-in-out .38s; will-change: opacity; background-color: rgba(0, 0, 0, .3) diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 349416a979..9bd91731a7 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -1,5 +1,10 @@ .nowPlayingInfoContainer { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -webkit-flex-direction: row; flex-direction: row } @@ -36,20 +41,27 @@ } .nowPlayingInfoButtons { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; + -webkit-flex-wrap: wrap; flex-wrap: wrap } .nowPlayingInfoControls, .nowPlayingTime { - display: flex; + display: -webkit-box; + display: -webkit-flex } .nowPlayingPageImageContainer { width: 20%; margin-right: .25em; position: relative; + -webkit-flex-shrink: 0; flex-shrink: 0 } @@ -60,9 +72,16 @@ } .nowPlayingInfoControls { + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1; display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -webkit-flex-direction: column; flex-direction: column; + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center } @@ -71,15 +90,25 @@ left: 0; right: 0; width: 100%; + -webkit-box-shadow: 0 0 1.9vh #000; box-shadow: 0 0 1.9vh #000; border: .1em solid #222; user-drag: none; user-select: none; + -moz-user-select: none; + -webkit-user-drag: none; + -webkit-user-select: none; + -ms-user-select: none } @media all and (orientation:portrait) and (max-width:50em) { .nowPlayingInfoContainer { + -webkit-box-orient: vertical !important; + -webkit-box-direction: normal !important; + -webkit-flex-direction: column !important; flex-direction: column !important; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center } @@ -93,6 +122,8 @@ } .nowPlayingInfoButtons { + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center } @@ -120,20 +151,33 @@ .nowPlayingTime { display: flex; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; margin: 0 1em } .nowPlayingSecondaryButtons { + display: -webkit-box; + display: -webkit-flex; display: flex; + -webkit-box-align: center; + -webkit-align-items: center; align-items: center; + -webkit-flex-wrap: wrap; flex-wrap: wrap; + -webkit-box-pack: center; + -webkit-justify-content: center; justify-content: center } @media all and (min-width:50em) { .nowPlayingSecondaryButtons { + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1; + -webkit-box-pack: end; + -webkit-justify-content: flex-end; justify-content: flex-end } } @@ -150,11 +194,13 @@ .smallBackdropPosterItem .cardOverlayInner>div { white-space: nowrap; + -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden } .playlistIndexIndicatorImage { + -webkit-background-size: initial initial !important; background-size: initial !important; background-image: url(assets/img/equalizer.gif) !important; } diff --git a/src/components/slideshow/style.css b/src/components/slideshow/style.css index 1167a972c8..43211a8fef 100644 --- a/src/components/slideshow/style.css +++ b/src/components/slideshow/style.css @@ -41,6 +41,9 @@ height: auto; max-width: 100%; max-height: 100%; + -ms-transform: translate(-50%, -50%); + -webkit-transform: translate(-50%, -50%); + -moz-transform: translate(-50%, -50%); transform: translate(-50%, -50%); position: absolute; left: 50%; diff --git a/src/components/subtitlesync/subtitlesync.css b/src/components/subtitlesync/subtitlesync.css index 38a15be901..112e624722 100644 --- a/src/components/subtitlesync/subtitlesync.css +++ b/src/components/subtitlesync/subtitlesync.css @@ -40,6 +40,8 @@ margin-right: 1%; top: 2.5em; height: 1.4em; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; flex-grow: 1; border-radius: .3em; z-index: 1; diff --git a/src/components/upnextdialog/upnextdialog.css b/src/components/upnextdialog/upnextdialog.css index 784c79cbb7..336a90d58e 100644 --- a/src/components/upnextdialog/upnextdialog.css +++ b/src/components/upnextdialog/upnextdialog.css @@ -11,6 +11,7 @@ background-color: rgba(0, 0, 0, 0.7); color: #fff; user-select: none; + -webkit-touch-callout: none; } .upNextDialog-hidden { @@ -66,4 +67,8 @@ border: 0; user-drag: none; user-select: none; + -moz-user-select: none; + -webkit-user-drag: none; + -webkit-user-select: none; + -ms-user-select: none; } diff --git a/src/elements/emby-button/emby-button.css b/src/elements/emby-button/emby-button.css index ee15e2e125..2201b2cd77 100644 --- a/src/elements/emby-button/emby-button.css +++ b/src/elements/emby-button/emby-button.css @@ -9,6 +9,9 @@ font-family: inherit; color: inherit; outline-width: 0; + -moz-user-select: none; + -ms-user-select: none; + -webkit-user-select: none; user-select: none; cursor: pointer; z-index: 0; @@ -21,6 +24,8 @@ outline: none !important; position: relative; font-weight: 600; + /* Disable webkit tap highlighting */ + -webkit-tap-highlight-color: rgba(0,0,0,0); text-decoration: none; /* Not crazy about this but it normalizes heights between anchors and buttons */ line-height: 1.35; @@ -94,6 +99,9 @@ font-size: inherit; font-family: inherit; color: inherit; + -moz-user-select: none; + -ms-user-select: none; + -webkit-user-select: none; user-select: none; cursor: pointer; z-index: 0; @@ -110,6 +118,8 @@ position: relative; overflow: hidden; border-radius: 50%; + /* Disable webkit tap highlighting */ + -webkit-tap-highlight-color: rgba(0,0,0,0); justify-content: center; transform-origin: center; transition: 0.2s; diff --git a/src/elements/emby-checkbox/emby-checkbox.css b/src/elements/emby-checkbox/emby-checkbox.css index 4e27928e2a..5641893f63 100644 --- a/src/elements/emby-checkbox/emby-checkbox.css +++ b/src/elements/emby-checkbox/emby-checkbox.css @@ -38,6 +38,9 @@ margin: 0; padding: 0; opacity: 0; + -ms-appearance: none; + -moz-appearance: none; + -webkit-appearance: none; appearance: none; border: none; } @@ -112,7 +115,7 @@ margin-bottom: .25em; } -@keyframes repaintChrome { +@-webkit-keyframes repaintChrome { from { padding: 0; } diff --git a/src/elements/emby-input/emby-input.css b/src/elements/emby-input/emby-input.css index 57a46ec7b6..d888eb570d 100644 --- a/src/elements/emby-input/emby-input.css +++ b/src/elements/emby-input/emby-input.css @@ -10,8 +10,10 @@ font-weight: inherit; padding: .4em .25em; /* Prevent padding from causing width overflow */ + -webkit-box-sizing: border-box; box-sizing: border-box; outline: none !important; + -webkit-tap-highlight-color: rgba(0,0,0,0); width: 100%; } @@ -33,5 +35,6 @@ } .emby-input-iconbutton { + -webkit-align-self: flex-end; align-self: flex-end; } diff --git a/src/elements/emby-radio/emby-radio.css b/src/elements/emby-radio/emby-radio.css index 6b8575bc86..25fdc5b933 100644 --- a/src/elements/emby-radio/emby-radio.css +++ b/src/elements/emby-radio/emby-radio.css @@ -27,6 +27,9 @@ margin: 0; padding: 0; opacity: 0; + -ms-appearance: none; + -moz-appearance: none; + -webkit-appearance: none; appearance: none; border: none; } @@ -67,13 +70,17 @@ cursor: pointer; transition-duration: 0.28s; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + transition-property: -webkit-transform; transition-property: transform; + transition-property: transform, -webkit-transform; + -webkit-transform: scale3d(0, 0, 0); transform: scale3d(0, 0, 0); border-radius: 50%; background: #00a4dc; } .mdl-radio__button:checked + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle { + -webkit-transform: scale3d(1, 1, 1); transform: scale3d(1, 1, 1); } diff --git a/src/elements/emby-select/emby-select.css b/src/elements/emby-select/emby-select.css index 4aff8cab92..76b28c4208 100644 --- a/src/elements/emby-select/emby-select.css +++ b/src/elements/emby-select/emby-select.css @@ -12,6 +12,7 @@ /* Prevent padding from causing width overflow */ box-sizing: border-box; outline: none !important; + -webkit-tap-highlight-color: rgba(0,0,0,0); width: 100%; } @@ -19,6 +20,8 @@ background: none !important; border-color: transparent !important; color: inherit !important; + -webkit-appearance: none; + -moz-appearance: none; appearance: none; } @@ -38,6 +41,7 @@ .emby-select-focusscale { transition: transform 180ms ease-out !important; + -webkit-transform-origin: center center; transform-origin: center center; } @@ -73,6 +77,7 @@ } .emby-select-withcolor { + -webkit-appearance: none; appearance: none; border-radius: .2em; } diff --git a/src/elements/emby-slider/emby-slider.css b/src/elements/emby-slider/emby-slider.css index 6fc861deb0..945cdd5214 100644 --- a/src/elements/emby-slider/emby-slider.css +++ b/src/elements/emby-slider/emby-slider.css @@ -1,21 +1,31 @@ _:-ms-input-placeholder { - appearance: none; + -ms-appearance: none; height: 2.223em; margin: 0; } .mdl-slider { width: 100%; + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; appearance: none; height: 150%;/*150% is needed, else ie and edge won't display the thumb properly*/ background: transparent; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; outline: 0; color: #00a4dc; + -webkit-align-self: center; + -ms-flex-item-align: center; align-self: center; z-index: 1; cursor: pointer; margin: 0; + /* Disable webkit tap highlighting */ + -webkit-tap-highlight-color: rgba(0,0,0,0); display: block; } @@ -59,7 +69,7 @@ _:-ms-input-placeholder { } .mdl-slider::-webkit-slider-thumb { - appearance: none; + -webkit-appearance: none; width: 1.2em; height: 1.2em; box-sizing: border-box; @@ -98,7 +108,7 @@ _:-ms-input-placeholder { } .mdl-slider::-ms-thumb { - appearance: none; + -webkit-appearance: none; width: 1.8em; height: 1.8em; box-sizing: border-box; diff --git a/src/elements/emby-textarea/emby-textarea.css b/src/elements/emby-textarea/emby-textarea.css index 0dab1b1ece..6ac8262236 100644 --- a/src/elements/emby-textarea/emby-textarea.css +++ b/src/elements/emby-textarea/emby-textarea.css @@ -13,6 +13,7 @@ /* Prevent padding from causing width overflow */ box-sizing: border-box; outline: none !important; + -webkit-tap-highlight-color: rgba(0,0,0,0); width: 100%; } diff --git a/src/elements/emby-toggle/emby-toggle.css b/src/elements/emby-toggle/emby-toggle.css index 3b14b8cf09..fb91419cbc 100644 --- a/src/elements/emby-toggle/emby-toggle.css +++ b/src/elements/emby-toggle/emby-toggle.css @@ -9,6 +9,10 @@ margin: 0; padding: 0; overflow: visible; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; user-select: none; flex-direction: row-reverse; justify-content: flex-end; @@ -24,6 +28,9 @@ margin: 0; padding: 0; opacity: 0; + -ms-appearance: none; + -moz-appearance: none; + -webkit-appearance: none; appearance: none; border: none; } @@ -82,6 +89,7 @@ position: absolute; top: 50%; left: 50%; + -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); display: inline-block; box-sizing: border-box; diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css index 4b694d6ece..d194dc2034 100644 --- a/src/themes/appletv/theme.css +++ b/src/themes/appletv/theme.css @@ -23,10 +23,14 @@ html { .skinHeader-withBackground { color: rgba(0, 0, 0, .7); background: #303030; + background: -webkit-gradient(linear, left top, right top, from(#BCBCBC), color-stop(#A7B4B7), color-stop(#BEB5A5), color-stop(#ADBEC2), to(#B9C7CB)); + background: -webkit-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB); + background: -o-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB); background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB) } .skinHeader.semiTransparent { + -webkit-backdrop-filter: none !important; backdrop-filter: none !important } @@ -41,10 +45,14 @@ html { .backgroundContainer, .dialog { background: #D5E9F2; + -webkit-background-size: 100% 100%; background-size: 100% 100% } .backgroundContainer.withBackdrop { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(192, 212, 222, .94)), color-stop(rgba(235, 250, 254, .94)), color-stop(rgba(227, 220, 212, .94)), color-stop(rgba(206, 214, 216, .94)), to(rgba(192, 211, 218, .94))); + background: -webkit-linear-gradient(top, rgba(192, 212, 222, .94), rgba(235, 250, 254, .94), rgba(227, 220, 212, .94), rgba(206, 214, 216, .94), rgba(192, 211, 218, .94)); + background: -o-linear-gradient(top, rgba(192, 212, 222, .94), rgba(235, 250, 254, .94), rgba(227, 220, 212, .94), rgba(206, 214, 216, .94), rgba(192, 211, 218, .94)); background: linear-gradient(to bottom, rgba(192, 212, 222, .94), rgba(235, 250, 254, .94), rgba(227, 220, 212, .94), rgba(206, 214, 216, .94), rgba(192, 211, 218, .94)) } @@ -181,6 +189,9 @@ html { .formDialogFooter:not(.formDialogFooter-clear) { color: rgba(0, 0, 0, .7); background: #303030; + background: -webkit-gradient(linear, left top, right top, from(#BCBCBC), color-stop(#A7B4B7), color-stop(#BEB5A5), color-stop(#ADBEC2), to(#B9C7CB)); + background: -webkit-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB); + background: -o-linear-gradient(left, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB); background: linear-gradient(to right, #BCBCBC, #A7B4B7, #BEB5A5, #ADBEC2, #B9C7CB) } @@ -245,6 +256,7 @@ html { color: inherit; background: rgba(255, 255, 255, .9); border: .07em solid rgba(0, 0, 0, .158); + -webkit-border-radius: .15em; border-radius: .15em } @@ -392,10 +404,18 @@ html { color: #fff } +.itemBackdropFader { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#E4E2DC)); + background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #E4E2DC); + background: -o-linear-gradient(rgba(0, 0, 0, 0), #E4E2DC); + background: linear-gradient(rgba(0, 0, 0, 0), #E4E2DC) +} + .infoBanner { color: #000; background: #fff3a5; padding: 1em; + -webkit-border-radius: .25em; border-radius: .25em } diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css index 5ab67ca317..02e8e46ea2 100644 --- a/src/themes/blueradiance/theme.css +++ b/src/themes/blueradiance/theme.css @@ -17,12 +17,19 @@ html { .skinHeader-withBackground { background: #303030; + background: -webkit-gradient(linear, left top, right top, from(#291A31), color-stop(#033664), color-stop(#011432), color-stop(#141A3A), to(#291A31)); + background: -webkit-linear-gradient(left, #291A31, #033664, #011432, #141A3A, #291A31); + background: -o-linear-gradient(left, #291A31, #033664, #011432, #141A3A, #291A31); background: linear-gradient(to right, #291A31, #033664, #011432, #141A3A, #291A31) } .skinHeader.semiTransparent { + -webkit-backdrop-filter: none !important; backdrop-filter: none !important; background-color: rgba(0, 0, 0, .3); + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))); + background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); + background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) } @@ -37,6 +44,7 @@ html { .backgroundContainer { background: url(bg.jpg) center top no-repeat #033361; + -webkit-background-size: cover; background-size: cover } @@ -173,7 +181,7 @@ html { color: rgba(255, 255, 255, .78) } -@supports (backdrop-filter:blur(10px)) { +@supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) { .appfooter-blurred { background: rgba(1, 2, 50, .7); backdrop-filter: blur(20px) @@ -245,6 +253,7 @@ html { color: inherit; background: rgba(0, 0, 0, .5); border: .07em solid transparent; + -webkit-border-radius: .15em; border-radius: .15em } @@ -398,10 +407,18 @@ html { color: #fff } +.itemBackdropFader { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#181818)); + background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #181818); + background: -o-linear-gradient(rgba(0, 0, 0, 0), #181818); + background: linear-gradient(rgba(0, 0, 0, 0), #181818) +} + .infoBanner { color: #ddd; background: #111; padding: 1em; + -webkit-border-radius: .25em; border-radius: .25em } @@ -433,7 +450,7 @@ html { } ::-webkit-scrollbar-track { - box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) } ::-webkit-scrollbar-track-piece { @@ -442,7 +459,7 @@ html { ::-webkit-scrollbar-thumb:horizontal, ::-webkit-scrollbar-thumb:vertical { - border-radius: 2px; + -webkit-border-radius: 2px; background: center no-repeat #888 } diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index bff054169d..5758f5d097 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -20,6 +20,7 @@ html { } .skinHeader.semiTransparent { + -webkit-backdrop-filter: none !important; backdrop-filter: none !important; background-color: rgba(0, 0, 0, 0.4); } @@ -226,6 +227,7 @@ html { color: inherit; background: #292929; border: .07em solid #292929; + -webkit-border-radius: .15em; border-radius: .15em } @@ -375,10 +377,18 @@ html { color: #fff } +.itemBackdropFader { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#101010)); + background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #101010); + background: -o-linear-gradient(rgba(0, 0, 0, 0), #101010); + background: linear-gradient(rgba(0, 0, 0, 0), #101010) +} + .infoBanner { color: #ddd; background: #111; padding: 1em; + -webkit-border-radius: .25em; border-radius: .25em } @@ -410,7 +420,7 @@ html { } ::-webkit-scrollbar-track { - box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) } ::-webkit-scrollbar-track-piece { @@ -419,7 +429,7 @@ html { ::-webkit-scrollbar-thumb:horizontal, ::-webkit-scrollbar-thumb:vertical { - border-radius: 2px; + -webkit-border-radius: 2px; background: center no-repeat #888 } diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css index 719678d0a6..65a9d5cf9f 100644 --- a/src/themes/light/theme.css +++ b/src/themes/light/theme.css @@ -23,14 +23,17 @@ html { background-color: #303030; color: #ccc; color: rgba(255, 255, 255, .87); + -webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37) } .osdHeader { + -webkit-box-shadow: none !important; box-shadow: none !important } .skinHeader.semiTransparent { + -webkit-backdrop-filter: none !important; backdrop-filter: none !important; background-color: rgba(0, 0, 0, 0.4); } @@ -246,6 +249,7 @@ html { color: inherit; background: #fff; border: .07em solid rgba(0, 0, 0, .158); + -webkit-border-radius: .15em; border-radius: .15em } @@ -392,10 +396,18 @@ html { color: #fff } +.itemBackdropFader { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#f2f2f2)); + background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #f2f2f2); + background: -o-linear-gradient(rgba(0, 0, 0, 0), #f2f2f2); + background: linear-gradient(rgba(0, 0, 0, 0), #f2f2f2) +} + .infoBanner { color: #000; background: #fff3a5; padding: 1em; + -webkit-border-radius: .25em; border-radius: .25em } diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index c53e80e80a..1892423aeb 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -17,12 +17,19 @@ html { .skinHeader-withBackground { background: #000420; + background: -moz-linear-gradient(left, #000420 0%, #06256f 18%, #2b052b 38%, #2b052b 68%, #06256f 81%, #000420 100%); + background: -webkit-linear-gradient(left, #000420 0%,#06256f 18%,#2b052b 38%,#2b052b 68%,#06256f 81%,#000420 100%); background: linear-gradient(to right, #000420 0%,#06256f 18%,#2b052b 38%,#2b052b 68%,#06256f 81%,#000420 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000420', endColorstr='#000420',GradientType=1 ); } .skinHeader.semiTransparent { + -webkit-backdrop-filter: none !important; backdrop-filter: none !important; background-color: rgba(0, 0, 0, .3); + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))); + background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); + background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) } @@ -37,6 +44,7 @@ html { .backgroundContainer { background: url(bg.jpg) center top no-repeat #030322; + -webkit-background-size: cover; background-size: cover } @@ -261,7 +269,7 @@ a[data-role=button] { color: rgba(255, 255, 255, .78) } -@supports (backdrop-filter:blur(10px)) { +@supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) { .appfooter-blurred { background: rgba(6, 37, 111, .7); backdrop-filter: blur(20px) @@ -333,6 +341,7 @@ a[data-role=button] { color: inherit; background: rgba(0, 0, 0, .5); border: .07em solid transparent; + -webkit-border-radius: .15em; border-radius: .15em } @@ -491,10 +500,18 @@ a[data-role=button] { color: #fff } +.itemBackdropFader { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#181818)); + background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #181818); + background: -o-linear-gradient(rgba(0, 0, 0, 0), #181818); + background: linear-gradient(rgba(0, 0, 0, 0), #181818) +} + .infoBanner { color: #0e0f2d; background: #dbe6ff; padding: 1em; + -webkit-border-radius: .25em; border-radius: .25em } @@ -532,7 +549,7 @@ a[data-role=button] { } ::-webkit-scrollbar-track { - box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) } ::-webkit-scrollbar-track-piece { @@ -541,7 +558,7 @@ a[data-role=button] { ::-webkit-scrollbar-thumb:horizontal, ::-webkit-scrollbar-thumb:vertical { - border-radius: 2px; + -webkit-border-radius: 2px; background: center no-repeat #888 } diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css index e51f4311ef..0367f080dc 100644 --- a/src/themes/wmc/theme.css +++ b/src/themes/wmc/theme.css @@ -23,12 +23,19 @@ html { .formDialogHeader:not(.formDialogHeader-clear), .skinHeader-withBackground { background-color: #0C2450; + background: -webkit-gradient(linear, left top, left bottom, from(#0C2450), to(#081B3B)); + background: -webkit-linear-gradient(top, #0C2450, #081B3B); + background: -o-linear-gradient(top, #0C2450, #081B3B); background: linear-gradient(to bottom, #0C2450, #081B3B) } .skinHeader.semiTransparent { + -webkit-backdrop-filter: none !important; backdrop-filter: none !important; background-color: rgba(0, 0, 0, .3); + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))); + background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); + background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) } @@ -39,6 +46,9 @@ html { .backgroundContainer, .dialog { background-color: #0F3562; + background: -webkit-gradient(linear, left top, left bottom, from(#0F3562), color-stop(#1162A4), to(#03215F)); + background: -webkit-linear-gradient(top, #0F3562, #1162A4, #03215F); + background: -o-linear-gradient(top, #0F3562, #1162A4, #03215F); background: linear-gradient(to bottom, #0F3562, #1162A4, #03215F) } @@ -160,6 +170,9 @@ html { .appfooter, .formDialogFooter:not(.formDialogFooter-clear) { background: #0C2450; + background: -webkit-gradient(linear, left bottom, left top, from(#0C2450), to(#081B3B)); + background: -webkit-linear-gradient(bottom, #0C2450, #081B3B); + background: -o-linear-gradient(bottom, #0C2450, #081B3B); background: linear-gradient(to top, #0C2450, #081B3B); color: rgba(255, 255, 255, .78) } @@ -226,6 +239,7 @@ html { color: inherit; background: rgba(255, 255, 255, .2); border: .07em solid rgba(255, 255, 255, .135); + -webkit-border-radius: .15em; border-radius: .15em } @@ -377,10 +391,18 @@ html { color: #fff } +.itemBackdropFader { + background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#115E9E)); + background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #115E9E); + background: -o-linear-gradient(rgba(0, 0, 0, 0), #115E9E); + background: linear-gradient(rgba(0, 0, 0, 0), #115E9E) +} + .infoBanner { color: #000; background: #fff3a5; padding: 1em; + -webkit-border-radius: .25em; border-radius: .25em } @@ -412,7 +434,7 @@ html { } ::-webkit-scrollbar-track { - box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3) } ::-webkit-scrollbar-track-piece { @@ -421,7 +443,7 @@ html { ::-webkit-scrollbar-thumb:horizontal, ::-webkit-scrollbar-thumb:vertical { - border-radius: 2px; + -webkit-border-radius: 2px; background: center no-repeat rgba(255, 255, 255, .7) } From b9b3cc7c2e565f50d0d1aab31539983ca7dc8cc9 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Thu, 9 Jan 2020 19:40:23 +0100 Subject: [PATCH 65/70] Revert "Add autoprefix to postcss" This reverts commit 509af1a0c304ed41582f8dc966cbefc7fd3c827b. --- package.json | 4 +- postcss.config.js | 5 -- webpack.dev.js | 2 +- webpack.prod.js | 4 +- yarn.lock | 212 +++++----------------------------------------- 5 files changed, 25 insertions(+), 202 deletions(-) delete mode 100644 postcss.config.js diff --git a/package.json b/package.json index 76d01b1841..c5f0e75c8c 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,12 @@ "repository": "https://github.com/jellyfin/jellyfin-web", "license": "GPL-2.0-or-later", "devDependencies": { - "autoprefixer": "^9.7.3", "clean-webpack-plugin": "^3.0.0", - "copy-webpack-plugin": "^5.1.1", + "copy-webpack-plugin": "^5.0.3", "css-loader": "^2.1.0", "eslint": "^5.16.0", "file-loader": "^3.0.1", "html-webpack-plugin": "^3.2.0", - "postcss-loader": "^3.0.0", "style-loader": "^0.23.1", "webpack": "^4.41.0", "webpack-cli": "^3.3.9", diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index a26de7e9f1..0000000000 --- a/postcss.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - plugins: [ - require('autoprefixer') - ] -} diff --git a/webpack.dev.js b/webpack.dev.js index d3791e679f..3aecac1a53 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -15,7 +15,7 @@ module.exports = merge(common, { rules: [ { test: /\.css$/i, - use: ["style-loader", "css-loader", "postcss-loader"] + use: ["style-loader", "css-loader"] }, { test: /\.(png|jpg|gif)$/i, diff --git a/webpack.prod.js b/webpack.prod.js index 319d8f14fc..8880a2168c 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -13,12 +13,12 @@ module.exports = merge(common, { rules: [ { test: /\.css$/i, - use: ["style-loader", "css-loader", "postcss-loader"] + use: ["style-loader", "css-loader"] }, { test: /\.(png|jpg|gif)$/i, use: ["file-loader"] } ] - } + }, }); diff --git a/yarn.lock b/yarn.lock index 705eac6a19..6a7d56f9df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -461,19 +461,6 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^9.7.3: - version "9.7.3" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4" - integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q== - dependencies: - browserslist "^4.8.0" - caniuse-lite "^1.0.30001012" - chalk "^2.4.2" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.23" - postcss-value-parser "^4.0.2" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -648,15 +635,6 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.8.0: - version "4.8.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289" - integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA== - dependencies: - caniuse-lite "^1.0.30001015" - electron-to-chromium "^1.3.322" - node-releases "^1.1.42" - buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -696,17 +674,16 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^12.0.2: - version "12.0.2" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c" - integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg== +cacache@^11.3.3: + version "11.3.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" + integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== dependencies: bluebird "^3.5.5" chownr "^1.1.1" figgy-pudding "^3.5.1" glob "^7.1.4" graceful-fs "^4.1.15" - infer-owner "^1.0.3" lru-cache "^5.1.1" mississippi "^3.0.0" mkdirp "^0.5.1" @@ -717,10 +694,10 @@ cacache@^12.0.2: unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^12.0.3: - version "12.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" - integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== +cacache@^12.0.2: + version "12.0.2" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c" + integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg== dependencies: bluebird "^3.5.5" chownr "^1.1.1" @@ -758,25 +735,6 @@ call-me-maybe@^1.0.1: resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -795,11 +753,6 @@ camelcase@^5.0.0, camelcase@^5.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015: - version "1.0.30001017" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001017.tgz#d3ad6ec18148b9bd991829958d9d7e562bb78cd6" - integrity sha512-EDnZyOJ6eYh6lHmCvCdHAFbfV4KJ9lSdfv4h/ppEhrU/Yudkl7jujwMZ1we6RX7DXqBfT04pVMQ4J+1wcTlsKA== - chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -1085,12 +1038,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" - integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg== +copy-webpack-plugin@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz#c78126f604e24f194c6ec2f43a64e232b5d43655" + integrity sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg== dependencies: - cacache "^12.0.3" + cacache "^11.3.3" find-cache-dir "^2.1.0" glob-parent "^3.1.0" globby "^7.1.1" @@ -1098,9 +1051,9 @@ copy-webpack-plugin@^5.1.1: loader-utils "^1.2.3" minimatch "^3.0.4" normalize-path "^3.0.0" - p-limit "^2.2.1" + p-limit "^2.2.0" schema-utils "^1.0.0" - serialize-javascript "^2.1.2" + serialize-javascript "^1.7.0" webpack-log "^2.0.0" core-util-is@~1.0.0: @@ -1108,16 +1061,6 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" - create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -1489,11 +1432,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.322: - version "1.3.322" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" - integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== - elliptic@^6.0.0: version "6.5.0" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.0.tgz#2b8ed4c891b7de3200e14412a5b8248c7af505ca" @@ -1555,13 +1493,6 @@ errno@^0.1.3, errno@~0.1.7: dependencies: prr "~1.0.1" -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - es-abstract@^1.5.1: version "1.16.2" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34" @@ -2484,21 +2415,6 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -import-cwd@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" - integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= - dependencies: - import-from "^2.1.0" - -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - import-fresh@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" @@ -2507,13 +2423,6 @@ import-fresh@^3.0.0: parent-module "^1.0.0" resolve-from "^4.0.0" -import-from@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" - integrity sha1-M1238qev/VOqpHHUuAId7ja387E= - dependencies: - resolve-from "^3.0.0" - import-local@2.0.0, import-local@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" @@ -2646,11 +2555,6 @@ is-arguments@^1.0.4: resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" @@ -2705,11 +2609,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-data-descriptor "^1.0.0" kind-of "^6.0.2" -is-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -2852,7 +2751,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@^3.13.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -2860,7 +2759,7 @@ js-yaml@^3.13.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -3380,13 +3279,6 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.42: - version "1.1.44" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.44.tgz#cd66438a6eb875e3eb012b6a12e48d9f4326ffd7" - integrity sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw== - dependencies: - semver "^6.3.0" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -3407,11 +3299,6 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - npm-bundled@^1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" @@ -3449,11 +3336,6 @@ nth-check@~1.0.1: dependencies: boolbase "~1.0.0" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -3614,20 +3496,13 @@ p-is-promise@^2.0.0: resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== -p-limit@^2.0.0: +p-limit@^2.0.0, p-limit@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ== dependencies: p-try "^2.0.0" -p-limit@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" - integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== - dependencies: - p-try "^2.0.0" - p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -3692,14 +3567,6 @@ parse-asn1@^5.0.0: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -3816,24 +3683,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-load-config@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003" - integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q== - dependencies: - cosmiconfig "^5.0.0" - import-cwd "^2.0.0" - -postcss-loader@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" - integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== - dependencies: - loader-utils "^1.1.0" - postcss "^7.0.0" - postcss-load-config "^2.0.0" - schema-utils "^1.0.0" - postcss-modules-extract-imports@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" @@ -3880,20 +3729,6 @@ postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" - integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ== - -postcss@^7.0.0, postcss@^7.0.23: - version "7.0.25" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.25.tgz#dd2a2a753d50b13bed7a2009b4a18ac14d9db21e" - integrity sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6: version "7.0.17" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f" @@ -4347,11 +4182,6 @@ serialize-javascript@^1.7.0: resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65" integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== -serialize-javascript@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" - integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== - serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -5099,10 +4929,10 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -webcomponents.js@^0.7.24: +webcomponents.js-2@^0.7.24: version "0.7.24" - resolved "https://registry.yarnpkg.com/webcomponents.js/-/webcomponents.js-0.7.24.tgz#2116fbfa1468ec416a7befdaa333e1d118f69c04" - integrity sha1-IRb7+hRo7EFqe+/aozPh0Rj2nAQ= + resolved "https://registry.yarnpkg.com/webcomponents.js-2/-/webcomponents.js-2-0.7.24.tgz#c0ffef99749c3970aa3ae71363ea6f0a40bcada6" + integrity sha1-wP/vmXScOXCqOucTY+pvCkC8raY= webpack-cli@^3.3.9: version "3.3.9" From 5fb98e950bea3f59608ec373d96603e44ce1ce73 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sun, 19 Jan 2020 11:52:19 +0100 Subject: [PATCH 66/70] Correct the reverted changes that should be kept --- package.json | 2 +- src/assets/css/dashboard.css | 2 ++ src/assets/css/librarybrowser.css | 34 ++++++------------- src/assets/css/scrollstyles.css | 4 +-- src/assets/css/videoosd.css | 25 ++++++++++++-- src/components/cardbuilder/card.css | 3 +- .../remotecontrol/remotecontrol.css | 1 + src/themes/appletv/theme.css | 7 ---- src/themes/blueradiance/theme.css | 7 ---- src/themes/dark/theme.css | 7 ---- src/themes/light/theme.css | 7 ---- src/themes/purplehaze/theme.css | 7 ---- src/themes/wmc/theme.css | 7 ---- webpack.prod.js | 2 +- yarn.lock | 32 ++++++++--------- 15 files changed, 56 insertions(+), 91 deletions(-) diff --git a/package.json b/package.json index c5f0e75c8c..09b793cd3a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "GPL-2.0-or-later", "devDependencies": { "clean-webpack-plugin": "^3.0.0", - "copy-webpack-plugin": "^5.0.3", + "copy-webpack-plugin": "^5.1.1", "css-loader": "^2.1.0", "eslint": "^5.16.0", "file-loader": "^3.0.1", diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index 1c69dfccb4..d1f0b540aa 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -1,5 +1,6 @@ .dashboardColumn, .dashboardSections { + flex-direction: column; -webkit-box-orient: vertical; -webkit-box-direction: normal } @@ -416,6 +417,7 @@ div[data-role=controlgroup] a.ui-btn-active { } a[data-role=button] { + background-clip: padding-box; -webkit-font-smoothing: antialiased; -webkit-user-select: none; -webkit-background-clip: padding-box; diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index c03cc2691f..8b312eed4b 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -488,9 +488,11 @@ } .detailImageContainer { - width: 280px; - margin-right: 2em; - flex-shrink: 0; + margin: 1.25em 0; + position: sticky; + top: 15%; + float: left; + width: 22.786458333333332vw; } .detailPagePrimaryContent { @@ -504,8 +506,8 @@ width: 25em; height: 9.375em; position: absolute; - top: 13.5%; - right: 19.5%; + top: 14.5%; + right: 10.5%; -webkit-background-size: contain; background-size: contain } @@ -535,13 +537,9 @@ } .itemDetailImage { - width: 100%; + width: 100% !important; + box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); -webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); - box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37) -} - -.thumbDetailImageContainer { - width: 400px } @media all and (max-width:62.5em) { @@ -554,19 +552,6 @@ } } -@media all and (min-width:62.5em) { - .itemBackdrop { - display: none - } - - .detailPagePrimaryContainer { - display: -webkit-box; - display: -webkit-flex; - display: flex; - margin-bottom: 3em - } -} - @media all and (max-width:75em) { .lnkSibling { display: none !important @@ -621,6 +606,7 @@ .detailButton-mobile, .mainDetailButtons { + display: flex; display: -webkit-box; display: -webkit-flex } diff --git a/src/assets/css/scrollstyles.css b/src/assets/css/scrollstyles.css index aa2f7dafad..431cd2ba1f 100644 --- a/src/assets/css/scrollstyles.css +++ b/src/assets/css/scrollstyles.css @@ -11,8 +11,6 @@ .hiddenScrollX, .layout-tv .scrollX { -ms-overflow-style: none; - /* Can't do this because it not only hides the scrollbar, but also prevents scrolling */ - /*overflow: -moz-scrollbars-none;*/ } .hiddenScrollX-forced { @@ -50,4 +48,4 @@ .hiddenScrollY::-webkit-scrollbar, .layout-tv .smoothScrollY::-webkit-scrollbar, .layout-tv .scrollY::-webkit-scrollbar { width: 0 !important; display: none; -} \ No newline at end of file +} diff --git a/src/assets/css/videoosd.css b/src/assets/css/videoosd.css index f9c4798e97..c43696dd45 100644 --- a/src/assets/css/videoosd.css +++ b/src/assets/css/videoosd.css @@ -1,5 +1,6 @@ .chapterThumbTextContainer, .videoOsdBottom { + user-select: none; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none @@ -137,8 +138,10 @@ .osdMediaInfo, .volumeButtons { + display: flex; display: -webkit-box; display: -webkit-flex; + align-items: center; -webkit-box-align: center } @@ -218,9 +221,25 @@ margin-left: auto; } -@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } } -@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } } -@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } } +@-moz-keyframes spin { + 100% { + -moz-transform: rotate(360deg); + } +} + +@-webkit-keyframes spin { + 100% { + -webkit-transform: rotate(360deg); + } +} + +@keyframes spin { + 100% { + -webkit-transform: rotate(360deg); + transform:rotate(360deg); + } +} + .osdMediaStatus .animate { -webkit-animation:spin 4s linear infinite; -moz-animation:spin 4s linear infinite; diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index e63b9a4bb1..96d0698f4b 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -83,7 +83,8 @@ button { /* These both are needed in case cardBox is a button */ -webkit-tap-highlight-color: rgba(0,0,0,0); outline: none !important; - contain: layout style; + contain: layout; + contain: style; } .card.show-focus:not(.show-animation) .cardBox { diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 9bd91731a7..cbd2f1fa06 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -53,6 +53,7 @@ .nowPlayingInfoControls, .nowPlayingTime { + display: flex; display: -webkit-box; display: -webkit-flex } diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css index d194dc2034..6e580ebea1 100644 --- a/src/themes/appletv/theme.css +++ b/src/themes/appletv/theme.css @@ -404,13 +404,6 @@ html { color: #fff } -.itemBackdropFader { - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#E4E2DC)); - background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #E4E2DC); - background: -o-linear-gradient(rgba(0, 0, 0, 0), #E4E2DC); - background: linear-gradient(rgba(0, 0, 0, 0), #E4E2DC) -} - .infoBanner { color: #000; background: #fff3a5; diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css index 02e8e46ea2..0c13a696b4 100644 --- a/src/themes/blueradiance/theme.css +++ b/src/themes/blueradiance/theme.css @@ -407,13 +407,6 @@ html { color: #fff } -.itemBackdropFader { - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#181818)); - background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #181818); - background: -o-linear-gradient(rgba(0, 0, 0, 0), #181818); - background: linear-gradient(rgba(0, 0, 0, 0), #181818) -} - .infoBanner { color: #ddd; background: #111; diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index 5758f5d097..fee28f50f0 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -377,13 +377,6 @@ html { color: #fff } -.itemBackdropFader { - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#101010)); - background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #101010); - background: -o-linear-gradient(rgba(0, 0, 0, 0), #101010); - background: linear-gradient(rgba(0, 0, 0, 0), #101010) -} - .infoBanner { color: #ddd; background: #111; diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css index 65a9d5cf9f..0d96abc531 100644 --- a/src/themes/light/theme.css +++ b/src/themes/light/theme.css @@ -396,13 +396,6 @@ html { color: #fff } -.itemBackdropFader { - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#f2f2f2)); - background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #f2f2f2); - background: -o-linear-gradient(rgba(0, 0, 0, 0), #f2f2f2); - background: linear-gradient(rgba(0, 0, 0, 0), #f2f2f2) -} - .infoBanner { color: #000; background: #fff3a5; diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index 1892423aeb..c8d7aa465c 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -500,13 +500,6 @@ a[data-role=button] { color: #fff } -.itemBackdropFader { - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#181818)); - background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #181818); - background: -o-linear-gradient(rgba(0, 0, 0, 0), #181818); - background: linear-gradient(rgba(0, 0, 0, 0), #181818) -} - .infoBanner { color: #0e0f2d; background: #dbe6ff; diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css index 0367f080dc..2901640809 100644 --- a/src/themes/wmc/theme.css +++ b/src/themes/wmc/theme.css @@ -391,13 +391,6 @@ html { color: #fff } -.itemBackdropFader { - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#115E9E)); - background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #115E9E); - background: -o-linear-gradient(rgba(0, 0, 0, 0), #115E9E); - background: linear-gradient(rgba(0, 0, 0, 0), #115E9E) -} - .infoBanner { color: #000; background: #fff3a5; diff --git a/webpack.prod.js b/webpack.prod.js index 8880a2168c..2055051dac 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -20,5 +20,5 @@ module.exports = merge(common, { use: ["file-loader"] } ] - }, + } }); diff --git a/yarn.lock b/yarn.lock index 6a7d56f9df..1526957e42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -694,10 +694,10 @@ cacache@^11.3.3: unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^12.0.2: - version "12.0.2" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c" - integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg== +cacache@^12.0.3: + version "12.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" + integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== dependencies: bluebird "^3.5.5" chownr "^1.1.1" @@ -1038,12 +1038,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz#c78126f604e24f194c6ec2f43a64e232b5d43655" - integrity sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg== +copy-webpack-plugin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" + integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg== dependencies: - cacache "^11.3.3" + cacache "^12.0.3" find-cache-dir "^2.1.0" glob-parent "^3.1.0" globby "^7.1.1" @@ -1051,9 +1051,9 @@ copy-webpack-plugin@^5.0.3: loader-utils "^1.2.3" minimatch "^3.0.4" normalize-path "^3.0.0" - p-limit "^2.2.0" + p-limit "^2.2.1" schema-utils "^1.0.0" - serialize-javascript "^1.7.0" + serialize-javascript "^2.1.2" webpack-log "^2.0.0" core-util-is@~1.0.0: @@ -2751,7 +2751,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.0: +js-yaml@^3.13.0, js-yaml@^3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -2759,7 +2759,7 @@ js-yaml@^3.13.0: argparse "^1.0.7" esprima "^4.0.0" -json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -4929,10 +4929,10 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -webcomponents.js-2@^0.7.24: +webcomponents.js@^0.7.24: version "0.7.24" - resolved "https://registry.yarnpkg.com/webcomponents.js-2/-/webcomponents.js-2-0.7.24.tgz#c0ffef99749c3970aa3ae71363ea6f0a40bcada6" - integrity sha1-wP/vmXScOXCqOucTY+pvCkC8raY= + resolved "https://registry.yarnpkg.com/webcomponents.js/-/webcomponents.js-0.7.24.tgz#2116fbfa1468ec416a7befdaa333e1d118f69c04" + integrity sha1-IRb7+hRo7EFqe+/aozPh0Rj2nAQ= webpack-cli@^3.3.9: version "3.3.9" From 91f5866d354a3dc1ae1db0910e49f4e87dde3c8e Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Tue, 21 Jan 2020 20:13:19 +0100 Subject: [PATCH 67/70] Keep standard properties in CSS along with vendored --- src/assets/css/librarybrowser.css | 1 + src/elements/emby-checkbox/emby-checkbox.css | 10 ++++++++++ src/elements/emby-slider/emby-slider.css | 1 + 3 files changed, 12 insertions(+) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 8b312eed4b..6ca85ae941 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -110,6 +110,7 @@ .detailButton-mobile, .skinHeader { + flex-direction: column; -webkit-flex-direction: column; -webkit-box-orient: vertical; -webkit-box-direction: normal diff --git a/src/elements/emby-checkbox/emby-checkbox.css b/src/elements/emby-checkbox/emby-checkbox.css index 5641893f63..a31691f9d3 100644 --- a/src/elements/emby-checkbox/emby-checkbox.css +++ b/src/elements/emby-checkbox/emby-checkbox.css @@ -115,6 +115,16 @@ margin-bottom: .25em; } +@keyframes repaintChrome { + from { + padding: 0; + } + + to { + padding: 0; + } +} + @-webkit-keyframes repaintChrome { from { padding: 0; diff --git a/src/elements/emby-slider/emby-slider.css b/src/elements/emby-slider/emby-slider.css index 945cdd5214..71f260772f 100644 --- a/src/elements/emby-slider/emby-slider.css +++ b/src/elements/emby-slider/emby-slider.css @@ -1,4 +1,5 @@ _:-ms-input-placeholder { + appearance: none; -ms-appearance: none; height: 2.223em; margin: 0; From 0d3a2179da4914448f5d1e0300d49fd2ca09febd Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 22 Jan 2020 19:50:00 +0000 Subject: [PATCH 68/70] Translated using Weblate (English (United Kingdom)) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/en_GB/ --- src/strings/en-gb.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json index 240ca57fae..1093463258 100644 --- a/src/strings/en-gb.json +++ b/src/strings/en-gb.json @@ -1461,5 +1461,6 @@ "ButtonAddImage": "Add Image", "OptionRandom": "Random", "SelectAdminUsername": "Please select a username for the admin account.", - "ButtonSplit": "Split" + "ButtonSplit": "Split", + "HeaderNavigation": "Navigation" } From 3634ae33830f13a421c928f5802349592ec8c948 Mon Sep 17 00:00:00 2001 From: 4d1m Date: Wed, 22 Jan 2020 07:40:03 +0000 Subject: [PATCH 69/70] Translated using Weblate (Romanian) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/ro/ --- src/strings/ro.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/strings/ro.json b/src/strings/ro.json index 80ddcbdd32..9fa92c69df 100644 --- a/src/strings/ro.json +++ b/src/strings/ro.json @@ -1453,5 +1453,6 @@ "TabCodecs": "Codecuri", "TabCatalog": "Catalog", "TV": "TV", - "SystemDlnaProfilesHelp": "Profilele de sistem pot fi numai citite. Modificările aduse unui profil de sistem vor fi salvate într-un nou profil personalizat." + "SystemDlnaProfilesHelp": "Profilele de sistem pot fi numai citite. Modificările aduse unui profil de sistem vor fi salvate într-un nou profil personalizat.", + "HeaderNavigation": "Navigare" } From bee1b9f979b7d417f92d9876bccf76583c9056be Mon Sep 17 00:00:00 2001 From: denikrejn1000 Date: Wed, 22 Jan 2020 19:51:39 +0000 Subject: [PATCH 70/70] Translated using Weblate (Serbian) Translation: Jellyfin/Jellyfin Web Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/sr/ --- src/strings/sr.json | 67 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/src/strings/sr.json b/src/strings/sr.json index 8b1abcfa7e..394ef9352e 100644 --- a/src/strings/sr.json +++ b/src/strings/sr.json @@ -30,5 +30,70 @@ "AddItemToCollectionHelp": "Додајте ставке у колекцију претрагом па затим десним кликом у менију изаберите да додате у колекцију.", "Add": "Додај", "Actor": "Глумац", - "AccessRestrictedTryAgainLater": "Приступ је тренутно ограничен. Покушајте поново касније." + "AccessRestrictedTryAgainLater": "Приступ је тренутно ограничен. Покушајте поново касније.", + "ButtonPause": "Пауза", + "ButtonParentalControl": "Родитељска контрола", + "ButtonOpen": "Отвори", + "ButtonOk": "Ок", + "ButtonOff": "Искључи", + "ButtonNextTrack": "Следећа трака", + "ButtonNew": "Ново", + "ButtonNetwork": "Мрежа", + "ButtonMore": "Више", + "ButtonManualLogin": "Ручни логин", + "ButtonLibraryAccess": "Приступ библиотеци", + "ButtonLearnMore": "Научи више", + "ButtonInfo": "Информације", + "ButtonHome": "Почетна страна", + "ButtonHelp": "Помоћ", + "ButtonGuide": "Водич", + "ButtonGotIt": "У реду", + "ButtonFullscreen": "Пун екран", + "ButtonForgotPassword": "Заборављена шифра", + "ButtonFilter": "Филтер", + "ButtonDownload": "Скини (даунлоадуј)", + "ButtonDown": "Доле", + "ButtonDeleteImage": "Обриши слику", + "ButtonDelete": "Обриши", + "ButtonConnect": "Повежи се", + "ButtonChangeServer": "Промени Сервер", + "ButtonCancel": "Откажи", + "ButtonBack": "Назад", + "ButtonAudioTracks": "Избор језика звука", + "ButtonArrowUp": "Горе", + "ButtonArrowRight": "Десно", + "ButtonArrowLeft": "Лево", + "ButtonArrowDown": "Доле", + "ButtonAddUser": "Додај корисника", + "ButtonAddServer": "Додај сервер", + "ButtonAddScheduledTaskTrigger": "Додај прекидач", + "ButtonAddMediaLibrary": "Додај каталог медија", + "ButtonAddImage": "Додај слику", + "ButtonAdd": "Додај", + "BrowsePluginCatalogMessage": "Претражуј наш каталог доступних додатака", + "Browse": "Изабери", + "BoxRear": "Омот (позади)", + "Box": "Омот", + "Blacklist": "Црна листа", + "BirthPlaceValue": "Место рођења", + "BirthLocation": "Место рођења", + "BirthDateValue": "Рођен", + "AutoBasedOnLanguageSetting": "Аутоматски (зависи од подешавања језика)", + "Audio": "Звук", + "AttributeNew": "Ново", + "AroundTime": "Около", + "AnyLanguage": "Било који језик", + "AlwaysPlaySubtitles": "Увек налепи титлове", + "AllowRemoteAccess": "Дозволи удаљено конектовање на Jellyfin Server.", + "AllowOnTheFlySubtitleExtraction": "Дозволи екстракцију титлова у реалном времену", + "AllowMediaConversionHelp": "Дозволи или забрани приступ функционалности конвертовања", + "AllowMediaConversion": "Дозволи конверзију медија", + "AllowHWTranscodingHelp": "Дозволи тјунеру да конвертује стрим у релном времену. Ово може да смањи потребу за конверзију на серверу.", + "AllLibraries": "Све библиотеке", + "AllLanguages": "Сви језици", + "AllEpisodes": "Све епизоде", + "AllChannels": "Сви канали", + "All": "Све", + "Alerts": "Упозорења", + "Aired": "Емитовано" }