From bc27a7ffa70e156b97f7bcd69be5a174b35fa72f Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 18 Oct 2023 17:21:31 +0200 Subject: [PATCH] fix border of context menu --- src/components/overlays/OverlayRouter.tsx | 2 +- src/components/player/atoms/Episodes.tsx | 2 +- .../player/atoms/settings/CaptionsView.tsx | 2 +- .../atoms/settings/SourceSelectingView.tsx | 2 +- .../player/internals/ContextUtils.tsx | 12 ++--- tailwind.config.js | 54 +++++++++---------- 6 files changed, 36 insertions(+), 38 deletions(-) diff --git a/src/components/overlays/OverlayRouter.tsx b/src/components/overlays/OverlayRouter.tsx index 1df891e9..ca6ff40a 100644 --- a/src/components/overlays/OverlayRouter.tsx +++ b/src/components/overlays/OverlayRouter.tsx @@ -73,7 +73,7 @@ function RouterBase(props: { id: string; children: ReactNode }) { return ( - +
- + E{ep.number} {ep.title} diff --git a/src/components/player/atoms/settings/CaptionsView.tsx b/src/components/player/atoms/settings/CaptionsView.tsx index fd68d89c..13f73bcf 100644 --- a/src/components/player/atoms/settings/CaptionsView.tsx +++ b/src/components/player/atoms/settings/CaptionsView.tsx @@ -26,7 +26,7 @@ export function CaptionOption(props: { }) { return (
diff --git a/src/components/player/atoms/settings/SourceSelectingView.tsx b/src/components/player/atoms/settings/SourceSelectingView.tsx index f0f1a9f4..4eaffef9 100644 --- a/src/components/player/atoms/settings/SourceSelectingView.tsx +++ b/src/components/player/atoms/settings/SourceSelectingView.tsx @@ -28,7 +28,7 @@ export function SourceOption(props: { return (
+

{props.children}

); @@ -58,8 +58,8 @@ function Link(props: { "flex justify-between items-center py-2 pl-3 pr-3 -ml-3 rounded w-full", { "cursor-default": !props.onClick, - "hover:bg-video-context-border hover:bg-opacity-10": !!props.onClick, - "bg-video-context-border bg-opacity-10": props.active, + "hover:bg-video-context-border": !!props.onClick, + "bg-video-context-border": props.active, } ); const styles = { width: "calc(100% + 1.5rem)" }; @@ -90,7 +90,7 @@ function Title(props: { }) { return (
-

+

{props.children}
{props.rightSide}

@@ -135,9 +135,7 @@ function IconButton(props: { icon: Icons; onClick?: () => void }) { } function Divider() { - return ( -
- ); + return
; } function SmallText(props: { children: React.ReactNode }) { diff --git a/tailwind.config.js b/tailwind.config.js index 88ef79a8..d68a6aa6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -26,23 +26,23 @@ module.exports = { "ash-400": "#3D394D", "ash-300": "#2C293A", "ash-200": "#2B2836", - "ash-100": "#1E1C26", + "ash-100": "#1E1C26" }, /* fonts */ fontFamily: { - "open-sans": "'Open Sans'", + "open-sans": "'Open Sans'" }, /* animations */ keyframes: { "loading-pin": { "0%, 40%, 100%": { height: "0.5em", "background-color": "#282336" }, - "20%": { height: "1em", "background-color": "white" }, - }, + "20%": { height: "1em", "background-color": "white" } + } }, - animation: { "loading-pin": "loading-pin 1.8s ease-in-out infinite" }, - }, + animation: { "loading-pin": "loading-pin 1.8s ease-in-out infinite" } + } }, plugins: [ require("tailwind-scrollbar"), @@ -52,31 +52,31 @@ module.exports = { colors: { // Branding pill: { - background: "#1C1C36", + background: "#1C1C36" }, // meta data for the theme itself global: { accentA: "#505DBD", - accentB: "#3440A1", + accentB: "#3440A1" }, // light bar lightBar: { - light: "#2A2A71", + light: "#2A2A71" }, // Buttons buttons: { toggle: "#8D44D6", - toggleDisabled: "#202836", + toggleDisabled: "#202836" }, // only used for body colors/textures background: { main: "#0A0A10", accentA: "#6E3B80", - accentB: "#1F1F50", + accentB: "#1F1F50" }, // typography @@ -85,7 +85,7 @@ module.exports = { text: "#73739D", dimmed: "#926CAD", divider: "#262632", - secondary: "#64647B", + secondary: "#64647B" }, // search bar @@ -94,7 +94,7 @@ module.exports = { focused: "#24243C", placeholder: "#4A4A71", icon: "#545476", - text: "#FFFFFF", + text: "#FFFFFF" }, // media cards @@ -106,7 +106,7 @@ module.exports = { barColor: "#4B4B63", barFillColor: "#BA7FD6", badge: "#151522", - badgeText: "#5F5F7A", + badgeText: "#5F5F7A" }, // video player @@ -118,23 +118,23 @@ module.exports = { error: "#E44F4F", success: "#40B44B", loading: "#B759D8", - noresult: "#64647B", + noresult: "#64647B" }, progress: { background: "#8787A8", preloaded: "#8787A8", - watched: "#A75FC9", + watched: "#A75FC9" }, audio: { - set: "#A75FC9", + set: "#A75FC9" }, context: { background: "#0C1216", light: "#4D79A8", - border: "#4F5C66", + border: "#141D23", buttonFocus: "#202836", flagBg: "#202836", cardBorder: "#1B262E", @@ -142,13 +142,13 @@ module.exports = { type: { main: "#617A8A", secondary: "#374A56", - accent: "#A570FA", - }, - }, - }, - }, - }, - }, - }), - ], + accent: "#A570FA" + } + } + } + } + } + } + }) + ] };