Skip to content

Commit

Permalink
Merge pull request #663 from JPVenson/master
Browse files Browse the repository at this point in the history
Added roku disclaimer in new Subtext to clients
  • Loading branch information
Shadowghost authored Sep 18, 2023
2 parents 6999e9b + c97347b commit 0a2f5b1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/components/clients/ClientDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const ClientDetails = ({ client }: { client: Client }) => (
<DetailsCard
title={client.name}
description={client.description}
smallDescription={client.smallDescription}
badges={
<>
<ClientTypeBadge clientType={client.clientType} />
Expand Down
3 changes: 3 additions & 0 deletions src/components/common/DetailsCard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
.details-card__footer .button:first-child {
margin-left: 0;
}
.details-card .card__body .card__body__helptext {
color: rgb(157, 148, 136);
}

@media (max-width: 420px) {
.details-card__header {
Expand Down
7 changes: 6 additions & 1 deletion src/components/common/DetailsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ type DetailsCardProps = {
id?: string;
title: string;
description: ReactNode;
smallDescription?: ReactNode;
badges?: ReactNode;
icons?: ReactNode;
primaryButtons?: Array<ReactNode>;
Expand All @@ -17,6 +18,7 @@ const DetailsCard: FunctionComponent<DetailsCardProps> = ({
id,
title,
description,
smallDescription,
badges = [],
icons = [],
primaryButtons = [],
Expand All @@ -31,7 +33,10 @@ const DetailsCard: FunctionComponent<DetailsCardProps> = ({
</div>
<div className='details-card__icons'>{icons}</div>
</div>
<div className='card__body padding-top--sm'>{description}</div>
<div className='card__body padding-top--sm'>
<p>{description}</p>
{smallDescription && <p className='card__body__helptext'>{smallDescription}</p>}
</div>
<div className='card__footer details-card__footer container'>
<div className='row'>
<div className='details-card__footer__buttons col'>
Expand Down
3 changes: 3 additions & 0 deletions src/data/clients.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export type Client = {
id: string;
name: string;
description: string;
smallDescription?: string;
clientType: ClientType;
deviceTypes: Array<DeviceType>;
licenseType: LicenseType;
Expand Down Expand Up @@ -534,6 +535,8 @@ export const Clients: Array<Client> = [
id: 'jellyfin-roku',
name: 'Jellyfin for Roku',
description: 'The official Jellyfin app for Roku devices.',
smallDescription:
'Due to a technical limitation of the Roku store, the Jellyfin app for Roku may state that a cable or satellite subscription is required. However, no subscription of any form is required to use the Jellyfin server or any official client.',
clientType: ClientType.Official,
deviceTypes: [DeviceType.TV],
licenseType: LicenseType.OpenSource,
Expand Down

0 comments on commit 0a2f5b1

Please sign in to comment.