From a1b3dddf9ef2fefc823d4ac827f2f0a87b5704c6 Mon Sep 17 00:00:00 2001 From: nickofolas Date: Fri, 11 Mar 2022 11:10:28 -0600 Subject: [PATCH 1/3] Add minHeight to editor tabs --- src/ScriptEditor/ui/ScriptEditorRoot.tsx | 37 ++++++++++++------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/ScriptEditor/ui/ScriptEditorRoot.tsx b/src/ScriptEditor/ui/ScriptEditorRoot.tsx index 2093f0af0..9851c6d7f 100644 --- a/src/ScriptEditor/ui/ScriptEditorRoot.tsx +++ b/src/ScriptEditor/ui/ScriptEditorRoot.tsx @@ -232,7 +232,7 @@ export function Root(props: IProps): React.ReactElement { MonacoVim.VimMode.Vim.mapCommand("gT", "action", "prevTabs", {}, { context: "normal" }); editor.focus(); }); - } catch {} + } catch { } } else if (!options.vim) { // Whem vim mode is disabled vimEditor?.dispose(); @@ -478,7 +478,7 @@ export function Root(props: IProps): React.ReactElement { } try { infLoop(newCode); - } catch (err) {} + } catch (err) { } } function saveScript(scriptToSave: OpenScript): void { @@ -829,15 +829,15 @@ export function Root(props: IProps): React.ReactElement { maxHeight: "38.5px", ...(currentScript?.fileName === openScripts[index].fileName ? { - background: Settings.theme.button, - borderColor: Settings.theme.button, - color: Settings.theme.primary, - } + background: Settings.theme.button, + borderColor: Settings.theme.button, + color: Settings.theme.primary, + } : { - background: Settings.theme.backgroundsecondary, - borderColor: Settings.theme.backgroundsecondary, - color: Settings.theme.secondary, - }), + background: Settings.theme.backgroundsecondary, + borderColor: Settings.theme.backgroundsecondary, + color: Settings.theme.secondary, + }), }; const scriptTabText = `${hostname}:~/${fileName} ${dirty(index)}`; @@ -870,18 +870,19 @@ export function Root(props: IProps): React.ReactElement { }} style={{ maxWidth: `${tabTextWidth}px`, + minHeight: '38.5px', overflow: "hidden", ...(currentScript?.fileName === openScripts[index].fileName ? { - background: Settings.theme.button, - borderColor: Settings.theme.button, - color: Settings.theme.primary, - } + background: Settings.theme.button, + borderColor: Settings.theme.button, + color: Settings.theme.primary, + } : { - background: Settings.theme.backgroundsecondary, - borderColor: Settings.theme.backgroundsecondary, - color: Settings.theme.secondary, - }), + background: Settings.theme.backgroundsecondary, + borderColor: Settings.theme.backgroundsecondary, + color: Settings.theme.secondary, + }), }} > From 6768d5ff1e529bceeaf7860da7c21f070c45b143 Mon Sep 17 00:00:00 2001 From: phyzical Date: Sat, 12 Mar 2022 11:50:03 +0800 Subject: [PATCH 2/3] remove nonexistant command from docs --- doc/source/basicgameplay/terminal.rst | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/doc/source/basicgameplay/terminal.rst b/doc/source/basicgameplay/terminal.rst index 89f6abc70..7a48d42d4 100644 --- a/doc/source/basicgameplay/terminal.rst +++ b/doc/source/basicgameplay/terminal.rst @@ -335,7 +335,7 @@ Then to kill this script the same arguments would have to be used:: $ kill foo.script 50e3 sigma-cosmetics -If you are killing the script using its PID, then the PID argument must be numeric. +If you are killing the script using its PID, then the PID argument must be numeric. killall ^^^^^^^ @@ -542,28 +542,6 @@ Then in order to check its logs with 'tail' the same arguments must be used:: $ tail foo.script 10 50000 -theme -^^^^^ - - $ theme [preset] | [#background #text #highlight] - -Change the color of the game's user interface - -This command can be called with a preset theme. Currently, the supported presets are: - -* default -* muted -* solarized - -However, you can also specify your own color scheme using hex values. -To do so, you must specify three hex color values for the background -color, the text color, and the highlight color. These hex values must -be preceded by a pound sign (#) and must be either 3 or 6 digits. Example:: - - $ theme #ffffff #385 #235012 - -A color picker such as Google's can be used to get your desired hex color values - top ^^^ From 1c7c4c29bd657ae002c7c2304591e88b73dc923e Mon Sep 17 00:00:00 2001 From: BB Date: Sun, 13 Mar 2022 13:06:20 +0100 Subject: [PATCH 3/3] Added missing apostrophe --- src/Augmentation/AugmentationHelpers.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Augmentation/AugmentationHelpers.tsx b/src/Augmentation/AugmentationHelpers.tsx index ba8f03024..7cd2d1ce6 100644 --- a/src/Augmentation/AugmentationHelpers.tsx +++ b/src/Augmentation/AugmentationHelpers.tsx @@ -1703,7 +1703,7 @@ function initAugmentations(): void { "The left arm of a legendary BitRunner who ascended beyond this world. " + "It projects a light blue energy shield that protects the exposed inner parts. " + "Even though it contains no weapons, the advanced tungsten titanium " + - "alloy increases the users strength to unbelievable levels. The augmentation " + + "alloy increases the user's strength to unbelievable levels. The augmentation " + "gets more powerful over time for seemingly no reason.", strength_mult: 2.7, });