From 8439a587efcbb01ca07285e5927d4ef361075a51 Mon Sep 17 00:00:00 2001 From: thgvr Date: Tue, 21 Nov 2023 18:29:30 -0800 Subject: [PATCH] Edits several files Updated tgui stuff --- tgui/packages/tgui/assets/bg-shiptest.svg | 29 ++++++++++++ tgui/packages/tgui/interfaces/Autolathe.js | 4 +- tgui/packages/tgui/styles/main.scss | 2 +- .../tgui/styles/themes/ntos_terminal.scss | 46 ++++++++----------- 4 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 tgui/packages/tgui/assets/bg-shiptest.svg diff --git a/tgui/packages/tgui/assets/bg-shiptest.svg b/tgui/packages/tgui/assets/bg-shiptest.svg new file mode 100644 index 000000000000..1da0fb0ff642 --- /dev/null +++ b/tgui/packages/tgui/assets/bg-shiptest.svg @@ -0,0 +1,29 @@ + + + + + + + image/svg+xml + + + + + AsciiSquid + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tgui/packages/tgui/interfaces/Autolathe.js b/tgui/packages/tgui/interfaces/Autolathe.js index c0fb5948960c..48709c794d06 100644 --- a/tgui/packages/tgui/interfaces/Autolathe.js +++ b/tgui/packages/tgui/interfaces/Autolathe.js @@ -37,7 +37,7 @@ export const Autolathe = (props, context) => { (material) => material.mineral_amount > 0 ); return ( - +
{ maxValue={design.maxmult} disabled={design.buildable} backgroundColor={ - design.buildable ? '#999999' : 'default' + design.buildable ? '#0000000' : 'default' } onCommit={(e, value) => act('make', { diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 2605673c7310..d0fea4281710 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -88,7 +88,7 @@ // NT Theme .Layout__content { - background-image: url('../assets/bg-nanotrasen.svg'); + background-image: url('../assets/bg-shiptest.svg'); background-size: 70%; background-position: center; background-repeat: no-repeat; diff --git a/tgui/packages/tgui/styles/themes/ntos_terminal.scss b/tgui/packages/tgui/styles/themes/ntos_terminal.scss index 234e20fce760..01a1ebb7d2e1 100644 --- a/tgui/packages/tgui/styles/themes/ntos_terminal.scss +++ b/tgui/packages/tgui/styles/themes/ntos_terminal.scss @@ -7,14 +7,14 @@ @use 'sass:meta'; @use '../colors.scss' with ( - $primary: #24e87e, - $label: #24e87e, - $good: rgba(36, 232, 127, 0.5), + $primary: #d19c55, + $label: #d19c55, + $good: rgba(178, 95, 51, 0.5), // $fg-map-keys: (), // $bg-map-keys: (), ); @use '../base.scss' with ( - $color-bg: #121b12, + $color-bg: #b25f33, $color-bg-grad-spread: 0% ); @@ -26,9 +26,9 @@ @include meta.load-css( '../components/Button.scss', $with: ( - 'color-default': rgba(0, 0, 0, 0), - 'color-disabled': #4a6a4a, - 'color-selected': rgba(36, 232, 127, 0.25) + 'color-default': rgba(178, 95, 51, 0.5), + 'color-disabled': rgba(0, 0, 0, 0), + 'color-selected': rgba(178, 95, 51, 0.5) ) ); @include meta.load-css( @@ -38,8 +38,8 @@ @include meta.load-css( '../components/ProgressBar.scss', $with: ( - 'background-color': rgba(0, 0, 0, 0.5), - 'color-default-fill': rgba(36, 232, 127, 0.5) + 'background-color': rgba(93, 59, 35, 0.8), + 'color-default-fill': rgba(178, 95, 51, 0.5) ) ); @include meta.load-css('../components/Modal.scss'); @@ -50,7 +50,7 @@ @include meta.load-css('../layouts/Window.scss'); @include meta.load-css( '../layouts/TitleBar.scss', - $with: ('background-color': rgba(0, 97, 0, 0.25)) + $with: ('background-color': rgba(99, 56, 33, 0.5)) ); .Layout__content { @@ -62,51 +62,43 @@ transparent 2.5px, transparent 5px ), - radial-gradient(rgba(0, 97, 0, 0.75), black 120%); + radial-gradient(rgba(178, 95, 51, 0.75), black 170%); background-size: 100%, 100%; background-position: center, center; } .Button { font: Inconsolata; - color: #24e87e; - text-shadow: 0 0 2px #24e87e; + color: #d19c55; } .Button:hover { - background-color: rgba(36, 232, 127, 0.25); + background-color: rgba(178, 95, 51, 0.25); transition: 0.1s; } .Button--selected { - color: #24e87e; + color: #d19c55; } body { //background-color: black; color: white; font: 1.3rem Inconsolata; - text-shadow: 0 0 2px #24e87e; //font: bold 12px Arial, 'Helvetica Neue', Helvetica, sans-serif; } .Section { - color: rgb(36, 232, 126); + color: #d19c55; } .Tab { - color: #24e87e; + color: #d19c55; } .Tab--selected { - color: #24e87e; - border: 2px solid #24e87e; - background-color: rgba(36, 232, 127, 0.25); + color: #d19c55; + border: 1px solid #d19c55; + background-color: rgba(178, 95, 51, 0.25); } ::selection { background: #0080ff; text-shadow: none; } - .Table { - text-shadow: 0 0 2px #24e87e; - } - .Flex { - text-shadow: 0 0 2px #24e87e; - } }