Merge pull request #10 from JipFr/master

Finish theming
This commit is contained in:
James Hawkins 2021-07-15 18:05:02 +01:00 committed by GitHub
commit 53d53b7a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 16 deletions

View File

@ -30,7 +30,7 @@
.inputSearchButton { .inputSearchButton {
background-color: var(--button); background-color: var(--button);
border-width: 0; border-width: 0;
color: var(--text); color: var(--button-text, var(--text));
padding: .5rem 2.1rem; padding: .5rem 2.1rem;
font-weight: bold; font-weight: bold;

View File

@ -43,6 +43,6 @@
} }
.numberSelector .choice.selected { .numberSelector .choice.selected {
color: var(--text); color: var(--choice-active-text, var(--text));
background-color: var(--choice-hover); background-color: var(--choice-active);
} }

View File

@ -24,7 +24,7 @@
.progress .bar { .progress .bar {
width: 13rem; width: 13rem;
max-width: 100%; max-width: 100%;
background-color: #35363D; background-color: var(--content);
border-radius: 10px; border-radius: 10px;
height: 7px; height: 7px;
display: inline-block; display: inline-block;

View File

@ -12,7 +12,7 @@
} }
.title-size-small { .title-size-small {
font-size: 1.1rem; font-size: 1.1rem;
color: #afb1b8; color: var(--text-secondary);
} }
.title-accent { .title-accent {

View File

@ -13,7 +13,7 @@
position: absolute; position: absolute;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
background-color: #3a3c46; background-color: var(--content);
height: 4px; height: 4px;
border-radius: 2px; border-radius: 2px;
} }
@ -27,14 +27,14 @@
align-items: center; align-items: center;
text-align: center; text-align: center;
box-sizing: border-box; box-sizing: border-box;
color: #585A67; color: var(--text-tertiary);
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
} }
.typeSelector .choice:hover { .typeSelector .choice:hover {
color: #afb1b8; color: var(--text-secondary);
} }
.typeSelector .choice.selected { .typeSelector .choice.selected {

View File

@ -1,6 +1,6 @@
.videoElement { .videoElement {
width: 100%; width: 100%;
background-color: #111117; background-color: var(--content);
border-radius: 5px; border-radius: 5px;
} }

View File

@ -27,8 +27,6 @@ export function VideoElement({ streamUrl, loading }) {
hls.loadSource(streamUrl); hls.loadSource(streamUrl);
}, [videoRef, streamUrl, loading]) }, [videoRef, streamUrl, loading])
// TODO make better loading/error/empty state
if (error) if (error)
return (<VideoPlaceholder>Your browser is not supported</VideoPlaceholder>) return (<VideoPlaceholder>Your browser is not supported</VideoPlaceholder>)
@ -36,7 +34,7 @@ export function VideoElement({ streamUrl, loading }) {
return <VideoPlaceholder>Loading episode...</VideoPlaceholder> return <VideoPlaceholder>Loading episode...</VideoPlaceholder>
if (!streamUrl || streamUrl.length === 0) if (!streamUrl || streamUrl.length === 0)
return <videoPlaceholder>No video selected</videoPlaceholder> return <VideoPlaceholder>No video selected</VideoPlaceholder>
return ( return (
<video className="videoElement" ref={videoRef} controls autoPlay /> <video className="videoElement" ref={videoRef} controls autoPlay />

View File

@ -1,6 +1,4 @@
:root { :root {
/* TODO finish theming for entire css */
--theme-color: #E880C5; --theme-color: #E880C5;
--theme-color-text: var(--theme-color); --theme-color-text: var(--theme-color);
@ -11,6 +9,7 @@
--text: white; --text: white;
--text-secondary: #BCBECB; --text-secondary: #BCBECB;
--text-tertiary: #585A67;
--content: #36363e; --content: #36363e;
--content-hover: #3C3D44; --content-hover: #3C3D44;
@ -18,12 +17,36 @@
--button: #A73B83; --button: #A73B83;
--button-hover: #9C3179; --button-hover: #9C3179;
--button-active: #8b286a; --button-active: #8b286a;
--button-text: var(--text);
--choice: #2E2F37; --choice: #2E2F37;
--choice-hover: #45464D; --choice-hover: #45464D;
--choice-active: #45464D; --choice-active: #45464D;
} }
/* @media (prefers-color-scheme: light) {
:root {
--theme-color: #457461;
--body: white;
--card: #f8f9fa;
--content: #eee;
--content-hover: #e7e7e7;
--text: #333;
--text-secondary: #616161;
--text-tertiary: #aaa;
--button: #457461;
--button-hover: #4e836e;
--button-active: #437a64;
--button-text: white;
--choice: var(--content);
--choice-hover: var(--content-hover);
--choice-active: var(--content-hover);
}
} */
body, html { body, html {
margin: 0; margin: 0;

View File

@ -29,7 +29,7 @@
margin: 0; margin: 0;
} }
.topRightCredits a:hover, .topRightCredits a:active { .topRightCredits a:hover, .topRightCredits a:active {
color: #f19fd6; color: var(--theme-color);
text-decoration: none; text-decoration: none;
} }