From e4fda909ffdc9d3dce769af896cd41c70e108598 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 19 Sep 2020 06:47:52 -0700 Subject: [PATCH] Use winamp colors for upload grid --- src/components/Metadata.js | 1 - src/theme.js | 11 +++++++++++ src/upload/UploadGrid.js | 2 ++ src/upload/UploadRow.js | 17 +++++++++-------- 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 src/theme.js diff --git a/src/components/Metadata.js b/src/components/Metadata.js index 2a6252a1..03b58daa 100644 --- a/src/components/Metadata.js +++ b/src/components/Metadata.js @@ -14,7 +14,6 @@ import { useActionCreator } from "../hooks"; function Metadata() { const hash = useSelector(Selectors.getSelectedSkinHash); const skinData = useSelector((state) => state.skins[hash] || null); - console.log(skinData); const fileName = skinData && skinData.fileName; const permalink = useSelector( diff --git a/src/theme.js b/src/theme.js new file mode 100644 index 00000000..e9e4c46a --- /dev/null +++ b/src/theme.js @@ -0,0 +1,11 @@ +/** + * [Text] +Normal=#00FF00 +Current=#FFFFFF +NormalBG=#000000 +SelectedBG=#0000C6 +Font=Arial + + */ +export const WINAMP_NORMAL = "#00FF00"; +export const WINAMP_SELECTED_BG = "#0000C6"; diff --git a/src/upload/UploadGrid.js b/src/upload/UploadGrid.js index 513a7630..b065f020 100644 --- a/src/upload/UploadGrid.js +++ b/src/upload/UploadGrid.js @@ -5,6 +5,7 @@ import { useActionCreator } from "../hooks"; import * as Actions from "../redux/actionCreators"; import DropTarget from "../DropTarget"; import UploadSection from "./UploadSection"; +import { WINAMP_NORMAL } from "../theme"; function useBucketed(filesArr) { return useMemo(() => { @@ -113,6 +114,7 @@ function UploadGrid({ getInputProps, isDragActive, ...props }) { display: "flex", flexDirection: "column", color: "lightgrey", + fontFamily: "Arial, Helvetica, sans-serif", }} > {isDragActive || Object.keys(files).length === 0 ? ( diff --git a/src/upload/UploadRow.js b/src/upload/UploadRow.js index aab6e526..4ccb6615 100644 --- a/src/upload/UploadRow.js +++ b/src/upload/UploadRow.js @@ -1,20 +1,21 @@ import React from "react"; import * as Utils from "../utils"; +import { WINAMP_NORMAL, WINAMP_SELECTED_BG } from "../theme"; function Row({ name, loading, right, complete }) { return (
{(loading != null || complete) && (
- {name} + {name} {right && ( - {right} - + )}
@@ -60,7 +61,7 @@ function SkinLink({ md5, children }) { href={Utils.museumUrlFromHash(md5)} target="_blank" rel="noopener noreferrer" - style={{ color: "darkgray" }} + style={{ color: WINAMP_NORMAL }} > {children}