From 2ed3f9a3ad2a537ff0f439e6e117a2099dfef566 Mon Sep 17 00:00:00 2001 From: He4eT Date: Wed, 3 Mar 2021 03:15:55 +0500 Subject: [PATCH] Simplify themes --- src/components/Player/InputBox.jsx | 2 +- src/style/themes.css | 101 ++++++++--------------------- src/themes/themes.js | 13 ++-- 3 files changed, 32 insertions(+), 84 deletions(-) diff --git a/src/components/Player/InputBox.jsx b/src/components/Player/InputBox.jsx index cb83f97..a321ae7 100644 --- a/src/components/Player/InputBox.jsx +++ b/src/components/Player/InputBox.jsx @@ -64,7 +64,7 @@ export default function ({ currentWindow, inputType, sendMessage }) { const inputHandlers = { char: { - placeholder: 'Press any key', + placeholder: 'Press any key here', onKeyDown: charHandler }, line: { diff --git a/src/style/themes.css b/src/style/themes.css index 7674063..444c81e 100644 --- a/src/style/themes.css +++ b/src/style/themes.css @@ -1,99 +1,52 @@ -.default { - --bg-color: #ffffff; +body { + --outer-padding: 0px; + --border-width: 0px; + --inner-padding: 8px; + --input-box-margin: 0px; +} +@media (min-width: 800px) { + body { + --outer-padding: 8px; + --border-width: 2px; + --input-box-margin: 8px; + } +} + +/* */ + +.light { + --bg-color: hsl(0, 0%, 100%, 1); --main-color: hsl(0, 0%, 0%, 0.8); - --outer-padding: 0px; - --inner-padding: 8px; - --border-width: 0px; - --input-box-margin: 8px; } -.default-borders { - --bg-color: #ffffff; - --main-color: hsl(0, 0%, 0%, 0.8); - --outer-padding: 8px; - --inner-padding: 8px; - --border-width: 2px; - --input-box-margin: 8px; -} - -.default-dim { - --bg-color: hsl(0, 0%, 20%); +.dim { + --bg-color: hsl(0, 0%, 20%, 1); --main-color: hsl(0, 0%, 100%, 0.8); - --outer-padding: 0px; - --inner-padding: 8px; - --border-width: 0px; - --input-box-margin: 8px; } -.default-dim-borders { - --bg-color: hsl(0, 0%, 20%); - --main-color: hsl(0, 0%, 100%, 0.8); - --outer-padding: 8px; - --inner-padding: 8px; - --border-width: 2px; - --input-box-margin: 8px; -} - -.default-dark { - --bg-color: #000000; - --main-color: #ffffff; - --outer-padding: 0px; - --inner-padding: 8px; - --border-width: 0px; - --input-box-margin: 8px; -} - -.default-dark-borders { - --bg-color: #000000; - --main-color: #ffffff; - --outer-padding: 8px; - --inner-padding: 8px; - --border-width: 2px; - --input-box-margin: 8px; +.dark { + --bg-color: hsl(0, 0%, 0%, 1); + --main-color: hsl(0, 0%, 100%, 1); } /* solarized */ -.solarized-light, -.solarized-light-borders, -.solarized-dark, -.solarized-dark-borders { - --outer-padding: 0px; - --inner-padding: 8px; - --border-width: 0px; - --input-box-margin: 8px; -} - -.solarized-light-borders, -.solarized-dark-borders { - --outer-padding: 8px; - --inner-padding: 8px; - --border-width: 2px; - --input-box-margin: 8px; -} - -.solarized-light, -.solarized-light-borders { +.solarized-light { --main-color: #586e75; --bg-color: #eee8d5; } -.solarized-dark, -.solarized-dark-borders { +.solarized-dark { --main-color: #93a1a1; --bg-color: #073642; } .solarized-light strong, -.solarized-light-borders strong, -.solarized-dark strong, -.solarized-dark-borders strong{ +.solarized-dark strong { color: #b58900; } .solarized-light .message.input, -.solarized-light-borders .message.input, -.solarized-dark .message.input, -.solarized-dark-borders .message.input{ +.solarized-dark .message.input { color: #2aa198; } diff --git a/src/themes/themes.js b/src/themes/themes.js index bb4be1a..a582b25 100644 --- a/src/themes/themes.js +++ b/src/themes/themes.js @@ -3,16 +3,11 @@ import { useState } from 'preact/hooks' import '~/src/style/themes.css' const themes = [ - 'default', - 'default-borders', - 'default-dim', - 'default-dim-borders', - 'default-dark', - 'default-dark-borders', + 'light', + 'dim', + 'dark', 'solarized-light', - 'solarized-light-borders', - 'solarized-dark', - 'solarized-dark-borders' + 'solarized-dark' ] const DEFAULT_THEME = themes[0]