From a02e80a08cf14f3f7a43bafea865f4f129a76f05 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 8 Jan 2020 11:19:27 +0900 Subject: [PATCH 1/4] add new icon for android client and move kodi icon --- src/assets/img/devices/android.svg | 4 ++ src/assets/img/devices/kodi.svg | 11 ++++ src/img/devices/kodi.svg | 83 ------------------------------ 3 files changed, 15 insertions(+), 83 deletions(-) create mode 100644 src/assets/img/devices/android.svg create mode 100644 src/assets/img/devices/kodi.svg delete mode 100644 src/img/devices/kodi.svg diff --git a/src/assets/img/devices/android.svg b/src/assets/img/devices/android.svg new file mode 100644 index 0000000000..c0d377bb72 --- /dev/null +++ b/src/assets/img/devices/android.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/devices/kodi.svg b/src/assets/img/devices/kodi.svg new file mode 100644 index 0000000000..3618149b1f --- /dev/null +++ b/src/assets/img/devices/kodi.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/img/devices/kodi.svg b/src/img/devices/kodi.svg deleted file mode 100644 index 20a10194f6..0000000000 --- a/src/img/devices/kodi.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - From 2db6bb4acfa55095fc93632276adac657603ad7a Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 8 Jan 2020 11:20:32 +0900 Subject: [PATCH 2/4] use android icon for dashboard --- src/scripts/imagehelper.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js index c2cbc3de71..96961eb0cc 100644 --- a/src/scripts/imagehelper.js +++ b/src/scripts/imagehelper.js @@ -12,6 +12,8 @@ define(["browser"], function (browser) { return baseUrl + "playstation.svg"; case "Kodi": return baseUrl + "kodi.svg"; + case "Jellyfin Android": + return baseUrl + "android.svg"; case "Jellyfin Web": switch (device.Name) { case "Opera": From 2978e64b9bea18122938907a416f2d1fecea9cb7 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 8 Jan 2020 23:18:00 +0900 Subject: [PATCH 3/4] fix a few minor style issues --- src/assets/css/librarybrowser.css | 2 +- src/components/listview/listview.css | 12 ++++++------ src/controllers/itemdetailpage.js | 2 +- src/itemdetails.html | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 8b4f766195..e86ffe2e66 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -24,7 +24,7 @@ } .itemDetailPage { - padding-top: 4em !important + padding-top: 0em !important } .standalonePage { diff --git a/src/components/listview/listview.css b/src/components/listview/listview.css index d91a5377ba..4d3b27ce75 100644 --- a/src/components/listview/listview.css +++ b/src/components/listview/listview.css @@ -126,20 +126,20 @@ align-self: center; justify-self: center; margin: auto; - color: rgba(255, 255, 255, .6); + color: rgba(255, 255, 255, 0.6); + background: rgba(0, 0, 0, 0.4); font-size: 1.6em; - background: transparent; - transition: transform 200ms ease-out; + transition: 200ms ease-out; display: flex; } .listItemImageButton:hover { + color: #00a4dc; + background: rgba(0, 164, 220, 0.2); transform: scale(1.2, 1.2); } .listItemImageButton-icon { - background: rgba(0,0,0,.4); - border: 0.1em solid currentColor; border-radius: 100em; display: flex; justify-content: center; @@ -264,4 +264,4 @@ .listItemCheckboxContainer { width: auto !important; -} \ No newline at end of file +} diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js index 7209c0f9fc..1a0b66c75a 100644 --- a/src/controllers/itemdetailpage.js +++ b/src/controllers/itemdetailpage.js @@ -802,7 +802,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana } if (editable) { - html += ""; + html += ""; } if (detectRatio && item.PrimaryImageAspectRatio) { diff --git a/src/itemdetails.html b/src/itemdetails.html index 5240cd5744..5930010e3a 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -7,7 +7,7 @@
-
+
From 01776ae86f9e94e98cfbd54324bd4d070bec5d8a Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 9 Jan 2020 15:18:10 +0900 Subject: [PATCH 4/4] fix item details page for music --- src/assets/css/librarybrowser.css | 1 + src/itemdetails.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index e86ffe2e66..af106959e0 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -413,6 +413,7 @@ align-items: center; align-content: center; position: sticky; + background-color: #101010; top: 0; z-index: 2; } diff --git a/src/itemdetails.html b/src/itemdetails.html index 5930010e3a..fbe0cc50de 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -7,7 +7,7 @@
-
+