shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-28 04:52:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: restore border to ghost button and fix discover slider visibility toggle position (#3226)

Browse Source
This commit is contained in:
Ryan Cohen
2023-01-08 09:18:08 +09:00
committed by GitHub
parent 62e2de70bf
commit 2eebb7fd39
2 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Common/Button/index.tsx
View File

@@ -46,7 +46,7 @@ function Button<P extends ElementTypes = 'button'>(
ref?: React.Ref<Element<P>> ref?: React.Ref<Element<P>>
): JSX.Element { ): JSX.Element {
const buttonStyle = [ const buttonStyle = [
'inline-flex items-center justify-center border border-transparent leading-5 font-medium rounded-md focus:outline-none transition ease-in-out duration-150 cursor-pointer disabled:opacity-50 whitespace-nowrap', 'inline-flex items-center justify-center border leading-5 font-medium rounded-md focus:outline-none transition ease-in-out duration-150 cursor-pointer disabled:opacity-50 whitespace-nowrap',
]; ];
switch (buttonType) { switch (buttonType) {
case 'primary': case 'primary':
@@ -71,7 +71,7 @@ function Button<P extends ElementTypes = 'button'>(
break; break;
case 'ghost': case 'ghost':
buttonStyle.push( buttonStyle.push(
'text-white bg-transaprent border-gray-600 hover:border-gray-200 focus:border-gray-100 active:border-gray-100' 'text-white bg-transparent border-gray-600 hover:border-gray-200 focus:border-gray-100 active:border-gray-100'
); );
break; break;
default: default:

84
src/components/Discover/DiscoverSliderEdit/index.tsx
View File

@@ -184,48 +184,52 @@ const DiscoverSliderEdit = ({
/> />
)} )}
<div className="flex w-full flex-col rounded-t-lg border-t border-l border-r border-gray-800 bg-gray-900 p-4 text-gray-400 md:flex-row md:items-center md:space-x-2"> <div className="flex w-full flex-col rounded-t-lg border-t border-l border-r border-gray-800 bg-gray-900 p-4 text-gray-400 md:flex-row md:items-center md:space-x-2">
<div className="mb-4 flex space-x-2 md:mb-0"> <div
className={`${slider.data ? 'mb-4' : 'mb-0'} flex space-x-2 md:mb-0`}
>
<Bars3Icon className="h-6 w-6" /> <Bars3Icon className="h-6 w-6" />
<div>{getSliderTitle(slider)}</div> <div>{getSliderTitle(slider)}</div>
</div> </div>
<div className="pointer-events-none mb-4 flex-1 md:mb-0"> {slider.data && (
{(slider.type === DiscoverSliderType.TMDB_MOVIE_KEYWORD || <div className="pointer-events-none mb-4 flex-1 md:mb-0">
slider.type === DiscoverSliderType.TMDB_TV_KEYWORD) && ( {(slider.type === DiscoverSliderType.TMDB_MOVIE_KEYWORD ||
<div className="flex space-x-2"> slider.type === DiscoverSliderType.TMDB_TV_KEYWORD) && (
{slider.data?.split(',').map((keywordId) => ( <div className="flex space-x-2">
<KeywordTag {slider.data?.split(',').map((keywordId) => (
key={`slider-keywords-${slider.id}-${keywordId}`} <KeywordTag
keywordId={Number(keywordId)} key={`slider-keywords-${slider.id}-${keywordId}`}
/> keywordId={Number(keywordId)}
))} />
</div> ))}
)} </div>
{(slider.type === DiscoverSliderType.TMDB_NETWORK || )}
slider.type === DiscoverSliderType.TMDB_STUDIO) && ( {(slider.type === DiscoverSliderType.TMDB_NETWORK ||
<CompanyTag slider.type === DiscoverSliderType.TMDB_STUDIO) && (
type={ <CompanyTag
slider.type === DiscoverSliderType.TMDB_STUDIO type={
? 'studio' slider.type === DiscoverSliderType.TMDB_STUDIO
: 'network' ? 'studio'
} : 'network'
companyId={Number(slider.data)} }
/> companyId={Number(slider.data)}
)} />
{(slider.type === DiscoverSliderType.TMDB_TV_GENRE || )}
slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE) && ( {(slider.type === DiscoverSliderType.TMDB_TV_GENRE ||
<GenreTag slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE) && (
type={ <GenreTag
slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE type={
? 'movie' slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE
: 'tv' ? 'movie'
} : 'tv'
genreId={Number(slider.data)} }
/> genreId={Number(slider.data)}
)} />
{slider.type === DiscoverSliderType.TMDB_SEARCH && ( )}
<Tag iconSvg={<MagnifyingGlassIcon />}>{slider.data}</Tag> {slider.type === DiscoverSliderType.TMDB_SEARCH && (
)} <Tag iconSvg={<MagnifyingGlassIcon />}>{slider.data}</Tag>
</div> )}
</div>
)}
<div className="flex items-center space-x-2"> <div className="flex items-center space-x-2">
{!slider.isBuiltIn && ( {!slider.isBuiltIn && (
<> <>
@@ -265,7 +269,7 @@ const DiscoverSliderEdit = ({
</Button> </Button>
</> </>
)} )}
<div className="flex-1 pl-4 text-right"> <div className="absolute top-4 right-4 flex-1 pl-4 text-right md:relative md:top-0 md:right-0">
<Tooltip content={intl.formatMessage(messages.enable)}> <Tooltip content={intl.formatMessage(messages.enable)}>
<div> <div>
<SlideCheckbox <SlideCheckbox