Merge pull request #86 from JamesHawkinss/dev

Merge dev to master
This commit is contained in:
James Hawkins 2022-06-17 09:13:19 +01:00 committed by GitHub
commit 57197a9f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 14 deletions

View File

@ -1,6 +1,6 @@
{
"name": "movie-web",
"version": "2.0.2",
"version": "2.0.3",
"private": true,
"homepage": "https://movie.squeezebox.dev",
"dependencies": {

View File

@ -14,7 +14,7 @@ export function IconPatch(props: IconPatchProps) {
<div
className={`bg-denim-300 flex h-12 w-12 items-center justify-center rounded-full border-2 border-transparent transition-[color,transform,border-color] duration-75 ${
props.clickable
? "hover:bg-denim-400 m-2 cursor-pointer hover:scale-110 hover:text-white active:scale-125"
? "hover:bg-denim-400 cursor-pointer hover:scale-110 hover:text-white active:scale-125"
: ""
} ${props.active ? "text-bink-600 border-bink-600 bg-bink-100" : ""}`}
>

View File

@ -11,16 +11,16 @@ export interface NavigationProps {
export function Navigation(props: NavigationProps) {
return (
<div className="absolute left-0 right-0 top-0 flex items-center justify-between py-5 px-7">
<div className="flex items-center justify-center">
<div className="mr-6">
<div className="absolute left-0 right-0 top-0 flex items-center justify-between py-5 px-7 min-h-[88px]">
<div className="flex items-center justify-center w-full sm:w-fit">
<div className="mr-auto sm:mr-6">
<Link to="/">
<BrandPill clickable />
</Link>
</div>
{props.children}
</div>
<div className="flex">
<div className={`${props.children ? "hidden sm:flex" : "flex"} flex-row gap-4`}>
<a
href={DISCORD_LINK}
target="_blank"

View File

@ -7,7 +7,7 @@ export interface PaperProps {
export function Paper(props: PaperProps) {
return (
<div className={`bg-denim-200 rounded-xl p-12 ${props.className}`}>
<div className={`bg-denim-200 lg:rounded-xl px-4 sm:px-8 md:px-12 py-6 sm:py-8 md:py-12 ${props.className}`}>
{props.children}
</div>
)

View File

@ -14,7 +14,7 @@ export interface VideoPlayerProps {
export function SkeletonVideoPlayer(props: { error?: boolean }) {
return (
<div className="bg-denim-200 flex aspect-video w-full items-center justify-center rounded-xl">
<div className="bg-denim-200 flex aspect-video w-full items-center justify-center lg:rounded-xl">
{props.error ? (
<div className="flex flex-col items-center">
<IconPatch icon={Icons.WARNING} className="text-red-400" />
@ -81,7 +81,7 @@ export function VideoPlayer(props: VideoPlayerProps) {
<>
{skeletonUi}
<video
className={`bg-denim-500 w-full rounded-xl ${!showVideo ? "hidden" : ""
className={`bg-black w-full rounded-xl ${!showVideo ? "hidden" : ""
}`}
ref={videoRef}
onProgress={(e) =>

View File

@ -26,7 +26,7 @@ export function ArrowLink(props: ArrowLinkProps) {
const isExternal = !!(props as IArrowLinkPropsExternal).url;
const isInternal = !!(props as IArrowLinkPropsInternal).to;
const content = (
<span className="text-bink-600 hover:text-bink-700 group inline-flex cursor-pointer items-center space-x-1 font-bold active:scale-95">
<span className="text-bink-600 hover:text-bink-700 group inline-flex cursor-pointer items-center space-x-1 font-bold active:scale-95 mt-1 pr-1">
{direction === "left" ? (
<span className="text-xl transition-transform group-hover:-translate-x-1">
<Icon icon={Icons.ARROW_LEFT} />

View File

@ -3,5 +3,5 @@ export interface TitleProps {
}
export function Title(props: TitleProps) {
return <h1 className="text-4xl font-bold text-white">{props.children}</h1>;
return <h1 className="text-2xl sm:text-3xl md:text-4xl font-bold text-white">{props.children}</h1>;
}

View File

@ -2,4 +2,4 @@ export const CORS_PROXY_URL = "https://proxy-1.movie-web.workers.dev/?destinatio
export const OMDB_API_KEY = "aa0937c0";
export const DISCORD_LINK = "https://discord.gg/Jhqt4Xzpfb";
export const GITHUB_LINK = "https://github.com/JamesHawkinss/movie-web";
export const APP_VERSION = "2.0.2";
export const APP_VERSION = "2.0.3";

View File

@ -1876,7 +1876,7 @@
dependencies:
"@types/react" "^17"
"@types/react-router-dom@5.3.3":
"@types/react-router-dom@^5.3.3":
version "5.3.3"
resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83"
integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==
@ -1885,7 +1885,7 @@
"@types/react" "*"
"@types/react-router" "*"
"@types/react-router@*", "@types/react-router@5.1.18":
"@types/react-router@*", "@types/react-router@^5.1.18":
version "5.1.18"
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3"
integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==