diff --git a/css/activescripts.scss b/css/activescripts.scss index ecc4399a8..35e959558 100644 --- a/css/activescripts.scss +++ b/css/activescripts.scss @@ -4,10 +4,7 @@ list-style-type: none; } -#active-scripts-container { - position: fixed; - padding-top: 10px; - +.active-scripts-container { > p { width: 70%; margin: 6px; diff --git a/css/augmentations.scss b/css/augmentations.scss index e47f159bd..2615aa4d6 100644 --- a/css/augmentations.scss +++ b/css/augmentations.scss @@ -5,12 +5,7 @@ */ @import "theme"; -#augmentations-container { - position: fixed; - padding-top: 10px; -} - -#augmentations-content { +.augmentations-content { > p { font-size: $defaultFontSize * 0.875; width: 70%; diff --git a/css/bladeburner.scss b/css/bladeburner.scss index 9dabf176f..73ab7824f 100644 --- a/css/bladeburner.scss +++ b/css/bladeburner.scss @@ -1,8 +1,6 @@ @import "theme"; -#bladeburner-container { - position: fixed; - padding: 6px; +.bladeburner-container { a, div, p, diff --git a/css/codemirror-overrides.scss b/css/codemirror-overrides.scss deleted file mode 100644 index 7fcb36928..000000000 --- a/css/codemirror-overrides.scss +++ /dev/null @@ -1,49 +0,0 @@ -@import "theme"; - -/** - * Customized styling for the Code Mirror editor - */ - -#codemirror-form-wrapper { - height: 80%; - margin: 10px 0 0 6px; -} - -.CodeMirror { - height: 100%; - width: 100%; - border: 2px solid var(--my-highlight-color); - z-index: 1; - font-family: $fontFamily; - font-size: $defaultFontSize; -} - -/** - * Highlight matches - */ -.cm-matchhighlight { - background-color: #8f908a; -} - -.CodeMirror-selection-highlight-scrollbar { - background-color: #8f908a; -} - -/** - * Show Invisibles - */ -.cm-whitespace::before { - position: absolute; - pointer-events: none; - color: #404f7d; -} - -/** - * Vim command display - */ -#codemirror-vim-command-display-wrapper { - background-color: white; - font-size: 13px; - height: 30px; - margin-left: 6px; -} diff --git a/css/companymanagement.scss b/css/companymanagement.scss index 6f02e1bb9..13e2ccdcc 100644 --- a/css/companymanagement.scss +++ b/css/companymanagement.scss @@ -8,10 +8,10 @@ * companies */ -#cmpy-mgmt-container p, -#cmpy-mgmt-container a, -#cmpy-mgmt-container div, -#cmpy-mgmt-container br { +.cmpy-mgmt-container p, +.cmpy-mgmt-container a, +.cmpy-mgmt-container div, +.cmpy-mgmt-container br { font-size: $defaultFontSize * 0.8125; } diff --git a/css/corporation.scss b/css/corporation.scss deleted file mode 100644 index d3fb6335b..000000000 --- a/css/corporation.scss +++ /dev/null @@ -1,4 +0,0 @@ -#corporation-container { - position: fixed; - padding: 6px; -} diff --git a/css/gang.scss b/css/gang.scss index 18bedbf1c..abeafa2b3 100644 --- a/css/gang.scss +++ b/css/gang.scss @@ -5,10 +5,7 @@ * Styling for the Gang mechanic UI (BitNode-2) */ -#gang-container { - position: fixed; - padding: 6px; - +.gang-container { p, pre { font-size: $defaultFontSize * 0.9375; diff --git a/css/hacknetnodes.scss b/css/hacknetnodes.scss index 9bb81a6be..f06b0b79a 100644 --- a/css/hacknetnodes.scss +++ b/css/hacknetnodes.scss @@ -5,11 +5,6 @@ * Styling for the Hacknet Nodes UI Page */ -#hacknet-nodes-container { - position: fixed; - padding: 10px; -} - .hacknet-general-info { margin: 10px; width: 70vw; diff --git a/css/milestones.scss b/css/milestones.scss index 2dcd6c809..2e78780c1 100644 --- a/css/milestones.scss +++ b/css/milestones.scss @@ -1,5 +1,3 @@ -#milestones-container { - position: fixed; - padding: 6px; +.milestones-container { width: 60%; } diff --git a/css/resleeving.scss b/css/resleeving.scss index 3320bbb23..33c7bdc2e 100644 --- a/css/resleeving.scss +++ b/css/resleeving.scss @@ -3,11 +3,6 @@ */ @import "theme"; -#resleeve-container { - position: fixed; - padding: 6px; -} - .resleeve-elem { border: 1px solid white; margin: 4px; diff --git a/css/sleeves.scss b/css/sleeves.scss index 30cf2472d..a776ac7eb 100644 --- a/css/sleeves.scss +++ b/css/sleeves.scss @@ -3,11 +3,6 @@ */ @import "theme"; -#sleeves-container { - position: fixed; - padding: 6px; -} - .sleeve-elem { border: 1px solid white; margin: 4px; diff --git a/css/stockmarket.scss b/css/stockmarket.scss index a93bbee6f..fafafd56c 100644 --- a/css/stockmarket.scss +++ b/css/stockmarket.scss @@ -1,9 +1,6 @@ @import "theme"; -#stock-market-container { - position: fixed; - padding: 6px; - +.stock-market-container { p { font-size: $defaultFontSize * 0.8125; } diff --git a/src/Augmentation/ui/Root.tsx b/src/Augmentation/ui/Root.tsx index 8b8996f79..7f47a3377 100644 --- a/src/Augmentation/ui/Root.tsx +++ b/src/Augmentation/ui/Root.tsx @@ -45,7 +45,7 @@ export class AugmentationsRoot extends React.Component { return ( <> -
+

Purchased Augmentations

Below is a list of all Augmentations you have purchased but not yet installed. Click the button below to diff --git a/src/Bladeburner/ui/Root.tsx b/src/Bladeburner/ui/Root.tsx index 1fc293c77..6870e65ca 100644 --- a/src/Bladeburner/ui/Root.tsx +++ b/src/Bladeburner/ui/Root.tsx @@ -15,7 +15,7 @@ interface IProps { export function Root(props: IProps): React.ReactElement { return ( - <> +

- +
); } diff --git a/src/Corporation/ui/CorporationRoot.tsx b/src/Corporation/ui/CorporationRoot.tsx index e96f51619..8784a35a7 100644 --- a/src/Corporation/ui/CorporationRoot.tsx +++ b/src/Corporation/ui/CorporationRoot.tsx @@ -56,7 +56,7 @@ export function CorporationRoot(props: IProps): React.ReactElement { }, []); return ( - <> +
- +
); } diff --git a/src/Gang/ui/Root.tsx b/src/Gang/ui/Root.tsx index d6c544a7e..3d53c9277 100644 --- a/src/Gang/ui/Root.tsx +++ b/src/Gang/ui/Root.tsx @@ -30,7 +30,7 @@ export function Root(props: IProps): React.ReactElement { } return ( - <> +
Back @@ -53,6 +53,6 @@ export function Root(props: IProps): React.ReactElement { ) : ( )} - +
); } diff --git a/src/Milestones/ui/MilestonesRoot.tsx b/src/Milestones/ui/MilestonesRoot.tsx index 46d682dd9..0252232a0 100644 --- a/src/Milestones/ui/MilestonesRoot.tsx +++ b/src/Milestones/ui/MilestonesRoot.tsx @@ -30,7 +30,7 @@ export function MilestonesRoot(props: IProps): JSX.Element { } }); return ( - <> +

Milestones

Milestones don't reward you for completing them. They are here to guide you if you're lost. They will reset when @@ -40,6 +40,6 @@ export function MilestonesRoot(props: IProps): JSX.Element {

Completing fl1ght.exe

  • {milestones}
  • - +
    ); } diff --git a/src/StockMarket/ui/Root.tsx b/src/StockMarket/ui/Root.tsx index 1e2fd15f3..6effdfa11 100644 --- a/src/StockMarket/ui/Root.tsx +++ b/src/StockMarket/ui/Root.tsx @@ -61,7 +61,7 @@ export class StockMarketRoot extends React.Component { render(): React.ReactNode { return ( - <> +
    {this.props.p.hasWseAccount && ( { stockMarket={this.props.stockMarket} /> )} - +
    ); } } diff --git a/src/engineStyle.js b/src/engineStyle.js index c4292f512..ff7d57a03 100644 --- a/src/engineStyle.js +++ b/src/engineStyle.js @@ -8,7 +8,6 @@ import "../css/mainmenu.scss"; import "../css/characteroverview.scss"; import "../css/terminal.scss"; import "../css/scripteditor.scss"; -import "../css/codemirror-overrides.scss"; import "../css/activescripts.scss"; import "../css/hacknetnodes.scss"; import "../css/menupages.scss"; @@ -32,4 +31,3 @@ import "../css/dev-menu.css"; import "../css/casino.scss"; import "../css/milestones.scss"; import "../css/infiltration.scss"; -import "../css/corporation.scss"; diff --git a/src/ui/ActiveScripts/Root.tsx b/src/ui/ActiveScripts/Root.tsx index c5915d0c5..33da224c6 100644 --- a/src/ui/ActiveScripts/Root.tsx +++ b/src/ui/ActiveScripts/Root.tsx @@ -28,7 +28,7 @@ export function ActiveScriptsRoot(props: IProps): React.ReactElement { }, []); return ( - <> +

    This page displays a list of all of your scripts that are currently running across every machine. It also provides information about each script's production. The scripts are categorized by the hostname of the servers @@ -37,6 +37,6 @@ export function ActiveScriptsRoot(props: IProps): React.ReactElement { - +

    ); }