diff --git a/css/activescripts.scss b/css/activescripts.scss deleted file mode 100644 index f5f7593ba..000000000 --- a/css/activescripts.scss +++ /dev/null @@ -1,128 +0,0 @@ -@import "theme"; - -.active-scripts-list { - list-style-type: none; -} - -.active-scripts-container { - > p { - margin: 6px; - padding: 4px; - } - - .accordion-header { - > pre { - color: white; - } - } -} - -.active-scripts-server-header { - background-color: #444; - font-size: $defaultFontSize * 1.25; - color: #fff; - margin: 6px 6px 0 6px; - padding: 6px; - cursor: pointer; - width: 60%; - text-align: left; - border: none; - outline: none; - - &:after { - content: "\02795"; /* "plus" sign (+) */ - font-size: $defaultFontSize * 0.8125; - color: #fff; - float: right; - margin-left: 5px; - } - - &.active, - &:hover { - background-color: #555; - } -} - -.active-scripts-server-header.active { - &:after { - content: "\2796"; /* "minus" sign (-) */ - font-size: $defaultFontSize * 0.8125; - color: #fff; - float: right; - margin-left: 5px; - } - - &:hover { - background-color: #666; - } -} - -.active-scripts-server-panel { - margin: 0 6px 6px 6px; - padding: 0 6px 6px 6px; - width: 55%; - margin-left: 5%; - display: none; - - div, - ul, - ul > li { - background-color: #555; - } -} - -.active-scripts-script-header { - background-color: #555; - border: none; - color: var(--my-font-color); - cursor: pointer; - display: block; - outline: none; - padding: 4px 25px 4px 10px; - position: relative; - text-align: left; - width: auto; - - &:after { - content: "\02795"; /* "plus" sign (+) */ - font-size: $defaultFontSize * 0.8125; - float: right; - margin-left: 5px; - color: transparent; - text-shadow: 0 0 0 var(--my-font-color); - position: absolute; - bottom: 4px; - } - - &.active:after { - content: "\2796"; /* "minus" sign (-) */ - } - - &:hover, - &.active:hover { - background-color: #666; - } - - &.active { - background-color: #555; - } -} - -.active-scripts-script-panel { - background-color: #555; - display: none; - font-size: 14px; - margin-bottom: 6px; - padding: 0 18px; - width: auto; - - pre, - h2, - ul, - li { - background-color: #555; - width: auto; - color: #fff; - margin-left: 5%; - } -} diff --git a/css/loader.scss b/css/loader.scss index 33ce9e8c2..f1ef2c55e 100644 --- a/css/loader.scss +++ b/css/loader.scss @@ -32,7 +32,7 @@ .loaderoverlay { $spinnerBoxSize: 200px; - $themeColor: #6f3; + $themeColor: #0c0; position: absolute; width: 100%; diff --git a/css/styles.scss b/css/styles.scss index 1f9ffe5ae..4932ba5d9 100644 --- a/css/styles.scss +++ b/css/styles.scss @@ -4,7 +4,7 @@ @import "reset"; :root { - --my-font-color: #6f3; + --my-font-color: #0c0; --my-background-color: #000; --my-highlight-color: #fff; --my-prompt-color: #f92672; diff --git a/src/Casino/Blackjack.tsx b/src/Casino/Blackjack.tsx index 8d6abb029..03112e74c 100644 --- a/src/Casino/Blackjack.tsx +++ b/src/Casino/Blackjack.tsx @@ -340,15 +340,13 @@ export class Blackjack extends Game { {/* Buttons */} {!gameInProgress ? (
- + Start
) : (
- - Hit - + Hit Stay diff --git a/src/DevMenu.tsx b/src/DevMenu.tsx index 03a2dbfab..fdf6fa816 100644 --- a/src/DevMenu.tsx +++ b/src/DevMenu.tsx @@ -4,7 +4,6 @@ import { IEngine } from "./IEngine"; import { IRouter } from "./ui/Router"; import React from "react"; -import { TTheme as Theme } from "./ui/React/Theme"; import { General } from "./DevMenu/ui/General"; import { Stats } from "./DevMenu/ui/Stats"; @@ -30,32 +29,30 @@ interface IProps { export function DevMenuRoot(props: IProps): React.ReactElement { return ( - - <> -

Development Menu - Only meant to be used for testing/debugging

- - - - - - - - + <> +

Development Menu - Only meant to be used for testing/debugging

+ + + + + + + + - {props.player.bladeburner instanceof Bladeburner && } + {props.player.bladeburner instanceof Bladeburner && } - {props.player.inGang() && } + {props.player.inGang() && } - {props.player.hasCorporation() && } + {props.player.hasCorporation() && } - + - {props.player.hasWseAccount && } + {props.player.hasWseAccount && } - {props.player.sleeves.length > 0 && } + {props.player.sleeves.length > 0 && } - - -
+ + ); } diff --git a/src/DevMenu/ui/Adjuster.tsx b/src/DevMenu/ui/Adjuster.tsx index f567862f3..0a39365ad 100644 --- a/src/DevMenu/ui/Adjuster.tsx +++ b/src/DevMenu/ui/Adjuster.tsx @@ -37,12 +37,12 @@ export function Adjuster(props: IProps): React.ReactElement { startAdornment: ( <> - + - add(typeof value !== "string" ? value : 0)} size="large"> + add(typeof value !== "string" ? value : 0)} size="large"> @@ -51,16 +51,12 @@ export function Adjuster(props: IProps): React.ReactElement { endAdornment: ( <> - subtract(typeof value !== "string" ? value : 0)} - size="large" - > + subtract(typeof value !== "string" ? value : 0)} size="large"> - + diff --git a/src/DevMenu/ui/Augmentations.tsx b/src/DevMenu/ui/Augmentations.tsx index eb5b6b4d9..82a4d65b8 100644 --- a/src/DevMenu/ui/Augmentations.tsx +++ b/src/DevMenu/ui/Augmentations.tsx @@ -40,7 +40,7 @@ export function Augmentations(props: IProps): React.ReactElement { } return ( - + }>

Augmentations

@@ -53,23 +53,21 @@ export function Augmentations(props: IProps): React.ReactElement {