Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates default TGUI background, overhauls autolathe tgui theme #2515

Merged
merged 3 commits into from
Jan 7, 2024
Merged

Updates default TGUI background, overhauls autolathe tgui theme #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8439a58
Edits several files
thgvr Nov 22, 2023
2b0c7f7
Update tgui/packages/tgui/interfaces/Autolathe.js
thgvr Dec 4, 2023
5a74b10
Merge branch 'master' into new-tgui-stuff
MarkSuckerberg Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions tgui/packages/tgui/assets/bg-shiptest.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/Autolathe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Autolathe = (props, context) => {
(material) => material.mineral_amount > 0
);
return (
<Window title="Autolathe" width={600} height={600}>
<Window title="Autolathe" theme="ntos_terminal" width={600} height={700}>
<Window.Content scrollable>
<Section
title="Total Materials"
Expand Down Expand Up @@ -220,7 +220,7 @@ export const Autolathe = (props, context) => {
maxValue={design.maxmult}
disabled={design.buildable}
backgroundColor={
design.buildable ? '#999999' : 'default'
design.buildable ? '#00000000' : 'default'
}
onCommit={(e, value) =>
act('make', {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
46 changes: 19 additions & 27 deletions tgui/packages/tgui/styles/themes/ntos_terminal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%
);

Expand All @@ -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(
Expand All @@ -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');
Expand All @@ -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 {
Expand All @@ -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;
}
}