wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6746 from thornbill/ux-dependency

Browse Source 
Use logos from @jellyfin/ux-web
This commit is contained in:
Bill Thornton
2025-04-11 00:53:29 -04:00
committed by GitHub
parent d142c4d16c 458614d361
commit 971dcc162d
24 changed files with 88 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/experimental/components/drawers/DrawerHeaderLink.tsx
+1 -1
View File
@@ -6,7 +6,7 @@ import React from 'react';
import { useSystemInfo } from 'hooks/useSystemInfo';
import ListItemLink from 'components/ListItemLink';
import appIcon from 'assets/img/icon-transparent.png';
import appIcon from '@jellyfin/ux-web/icon-transparent.png';
const DrawerHeaderLink = () => {
const { data: systemInfo } = useSystemInfo();
src/assets/img/banner-dark.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 85 KiB

src/assets/img/banner-light.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 82 KiB

src/assets/img/icon-transparent.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

src/favicon.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

src/favicon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

src/index.html
+3 -34
View File
@@ -15,9 +15,9 @@
<meta id="themeColor" name="theme-color" content="#202020">
<link rel="apple-touch-icon" sizes="180x180" href="touchicon.png">
<link rel="shortcut icon" href="favicon.ico">
<meta name="msapplication-TileImage" content="touchicon144.png">
<link rel="apple-touch-icon" sizes="180x180" href="../node_modules/@jellyfin/ux-web/favicons/touchicon.png">
<link rel="shortcut icon" href="../node_modules/@jellyfin/ux-web/favicons/favicon.ico">
<meta name="msapplication-TileImage" content="../node_modules/@jellyfin/ux-web/favicons/touchicon144.png">
<meta name="msapplication-TileColor" content="#333333">
<title>Jellyfin</title>
@@ -80,37 +80,6 @@
[dir="rtl"] .mainDrawerHandle {
left: 0;
}
@keyframes fadein {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.splashLogo {
animation: fadein 0.5s;
width: 30%;
height: 30%;
background-image: url(assets/img/icon-transparent.png);
background-position: center center;
background-repeat: no-repeat;
background-size: contain;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
@media screen
and (min-device-width: 992px) {
.splashLogo {
background-image: url(assets/img/banner-light.png);
}
}
</style>
</head>
<body dir="ltr">
src/manifest.json
+4 -4
View File
@@ -10,22 +10,22 @@
"icons": [
{
"sizes": "72x72",
"src": "touchicon72.png",
"src": "favicons/touchicon72.png",
"type": "image/png"
},
{
"sizes": "114x114",
"src": "touchicon114.png",
"src": "favicons/touchicon114.png",
"type": "image/png"
},
{
"sizes": "144x144",
"src": "touchicon144.png",
"src": "favicons/touchicon144.png",
"type": "image/png"
},
{
"sizes": "512x512",
"src": "touchicon512.png",
"src": "favicons/touchicon512.png",
"type": "image/png"
}
]
src/plugins/logoScreensaver/plugin.js
+3 -1
View File
@@ -1,3 +1,5 @@
import icon from '@jellyfin/ux-web/icon-transparent.png';
import { PluginType } from '../../types/plugin.ts';
import { randomInt } from '../../utils/number.ts';
@@ -133,7 +135,7 @@ export default function () {
elem.classList.add('logoScreenSaver');
document.body.appendChild(elem);
elem.innerHTML = '<img class="logoScreenSaverImage" src="assets/img/banner-light.png" />';
elem.innerHTML = `<img class="logoScreenSaverImage" src="${icon}" />`;
}
stopInterval();
src/styles/site.scss
+31
View File
@@ -4,6 +4,37 @@
height: 100%;
}
@keyframes fadein {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.splashLogo {
animation: fadein 0.5s;
width: 30%;
height: 30%;
background-image: url(@jellyfin/ux-web/icon-transparent.png);
background-position: center center;
background-repeat: no-repeat;
background-size: contain;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
@media screen
and (min-device-width: 992px) {
.splashLogo {
background-image: url(@jellyfin/ux-web/banner-light.png);
}
}
html {
@include fullpage;
line-height: 1.35;
src/themes/appletv/theme.scss
+2 -2
View File
@@ -35,11 +35,11 @@ html {
}
.pageTitleWithDefaultLogo {
background-image: url(../../assets/img/banner-dark.png);
background-image: url(@jellyfin/ux-web/banner-dark.png);
}
.layout-tv .pageTitleWithDefaultLogo {
background-image: url(../../assets/img/icon-transparent.png);
background-image: url(@jellyfin/ux-web/icon-transparent.png);
}
html {
src/themes/blueradiance/theme.scss
+2 -2
View File
@@ -35,11 +35,11 @@ html {
}
.pageTitleWithDefaultLogo {
background-image: url(../../assets/img/banner-light.png);
background-image: url(@jellyfin/ux-web/banner-light.png);
}
.layout-tv .pageTitleWithDefaultLogo {
background-image: url(../../assets/img/icon-transparent.png);
background-image: url(@jellyfin/ux-web/icon-transparent.png);
}
.dialog,
src/themes/dark/theme.scss
+2 -2
View File
@@ -34,11 +34,11 @@ html {
}
.pageTitleWithDefaultLogo {
background-image: url(../../assets/img/banner-light.png);
background-image: url(@jellyfin/ux-web/banner-light.png);
}
.layout-tv .pageTitleWithDefaultLogo {
background-image: url(../../assets/img/icon-transparent.png);
background-image: url(@jellyfin/ux-web/icon-transparent.png);
}
.backgroundContainer,
src/themes/light/theme.scss
+2 -2
View File
@@ -44,11 +44,11 @@ html {
}
.pageTitleWithDefaultLogo {
background-image: url(../../assets/img/banner-light.png);
background-image: url(@jellyfin/ux-web/banner-light.png);
}
.layout-tv .pageTitleWithDefaultLogo {
background-image: url(../../assets/img/icon-transparent.png);
background-image: url(@jellyfin/ux-web/icon-transparent.png);
}
.backgroundContainer,
src/themes/purplehaze/theme.scss
+2 -2
View File
@@ -31,11 +31,11 @@ html {
}
.pageTitleWithDefaultLogo {
background-image: url(../../assets/img/banner-light.png);
background-image: url(@jellyfin/ux-web/banner-light.png);
}
.layout-tv .pageTitleWithDefaultLogo {
background-image: url(../../assets/img/icon-transparent.png);
background-image: url(@jellyfin/ux-web/icon-transparent.png);
}
.dialog,
src/themes/wmc/theme.scss
+2 -2
View File
@@ -41,11 +41,11 @@ html {
}
.pageTitleWithDefaultLogo {
background-image: url(../../assets/img/banner-light.png);
background-image: url(@jellyfin/ux-web/banner-light.png);
}
.layout-tv .pageTitleWithDefaultLogo {
background-image: url(../../assets/img/icon-transparent.png);
background-image: url(@jellyfin/ux-web/icon-transparent.png);
}
.backgroundContainer,
src/touchicon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.3 KiB

src/touchicon114.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.6 KiB

src/touchicon144.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

src/touchicon512.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

src/touchicon72.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB