Skip to content

Commit 33efcf3

Browse files
Kapu1178Kapu1178
authored
Atomize part of tgooey restyle (#1171)
* thinktronic rebrand * remove nanotrasen logo * atomize trivial scss changes
1 parent 3e79c82 commit 33efcf3

File tree

10 files changed

+55
-43
lines changed

10 files changed

+55
-43
lines changed

‎tgui/packages/tgui/styles/base.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ $color-bg-end: color.adjust(
1919
$lightness: -$color-bg-grad-spread
2020
) !default;
2121

22+
$border-radius: 0em !default;
23+
2224
$unit: 12px;
2325
$font-size: 1 * $unit !default;
24-
$border-radius: 0em !default;
26+
$font-family: (Verdana, Geneva, sans-serif) !default;
2527

2628
@function em($px) {
2729
@return 1em * math.div($px, $unit);

‎tgui/packages/tgui/styles/components/Input.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ $text-color: base.$color-fg !default;
1010
$background-color: #0a0a0a !default;
1111
$border-color: #88bfff !default;
1212
$border-radius: base.$border-radius !default;
13-
$font-family: Verdana, sans-serif !default;
1413

1514
.Input {
1615
position: relative;
@@ -52,7 +51,7 @@ $font-family: Verdana, sans-serif !default;
5251
height: base.em(17px);
5352
margin: 0;
5453
padding: 0 0.5em;
55-
font-family: $font-family;
54+
font-family: base.$font-family;
5655
background-color: transparent;
5756
color: $text-color;
5857
color: inherit;

‎tgui/packages/tgui/styles/components/LabeledList.scss

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
margin: -0.25em -0.5em;
1717
margin-bottom: 0;
1818
padding: 0;
19+
font-family: base.$font-family;
1920
}
2021

2122
.LabeledList__row {

‎tgui/packages/tgui/styles/main.scss

-4
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,4 @@
7474

7575
// NT Theme
7676
.Layout__content {
77-
background-image: url('../assets/bg-nanotrasen.svg');
78-
background-size: 70%;
79-
background-position: center;
80-
background-repeat: no-repeat;
8177
}

‎tgui/packages/tgui/styles/reset.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ html {
2020

2121
body {
2222
overflow: auto;
23-
font-family: Verdana, Geneva, sans-serif;
23+
font-family: base.$font-family;
2424
}
2525

2626
*,

‎tgui/packages/tgui/styles/themes/crt.scss

+36-17
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,32 @@
22
@use 'sass:math';
33
@use 'sass:meta';
44

5-
$font-family: monospace;
65
$background-radial-opacity: 0.2 !default;
6+
$color-bg: #ffffff !default;
7+
$color-fg: #333333 !default;
8+
$dark-fg: darken($color-fg, 30);
79

8-
@use '../base.scss';
10+
@use '../base.scss' with (
11+
$color-bg: $color-bg,
12+
$color-fg: $color-fg,
13+
$font-family: (
14+
monospace,
15+
Verdana,
16+
sans-serif,
17+
)
18+
);
919

1020
@use '../colors.scss' with (
1121
$primary: base.$color-fg,
12-
$label: base.$color-fg
22+
$label: base.$color-fg,
23+
$good: base.$color-fg,
24+
$bad: base.$color-fg,
25+
$average: base.$color-fg
1326
);
1427

1528
%theme-crt {
29+
// Atomic classes
30+
@include meta.load-css('../atomic/color.scss');
1631
@include meta.load-css(
1732
'../components/Divider.scss',
1833
$with: ('color': base.$color-fg)
@@ -33,8 +48,7 @@ $background-radial-opacity: 0.2 !default;
3348
$with: (
3449
'text-color': base.$color-fg,
3550
'background-color': base.$color-bg,
36-
'border-color': base.$color-fg,
37-
'font-family': $font-family
51+
'border-color': base.$color-fg
3852
)
3953
);
4054

@@ -59,7 +73,11 @@ $background-radial-opacity: 0.2 !default;
5973

6074
@include meta.load-css(
6175
'../components/ProgressBar.scss',
62-
$with: ('color-default-fill': base.$color-fg)
76+
$with: (
77+
'color-default-fill': base.$color-fg,
78+
'background-color': $dark-fg,
79+
'bg-map': colors.$bg-map
80+
)
6381
);
6482

6583
@include meta.load-css(
@@ -83,21 +101,23 @@ $background-radial-opacity: 0.2 !default;
83101
@include meta.load-css(
84102
'../components/Button.scss',
85103
$with: (
86-
'color-default': base.$color-fg,
87-
'color-disabled': darken(base.$color-fg, 30)
104+
'color-default': $dark-fg,
105+
'color-selected': base.$color-fg,
106+
'color-disabled': rbga(base.$color-fg, 0),
107+
'color-transparent-text': base.$color-fg
88108
)
89109
);
90110

91111
@include meta.load-css(
92112
'../components/Tabs.scss',
93113
$with: (
94-
'tab-color': base.$color-bg,
95-
'tab-color-selected': base.$color-fg,
114+
'tab-color': $dark-fg,
96115
'text-color': base.$color-fg,
97116
'text-color-selected': base.$color-bg,
98117
'tab-color-hovered': rgba(base.$color-fg, 0.3)
99118
)
100119
);
120+
@include meta.load-css('../components/LabeledList.scss');
101121

102122
.Layout__content {
103123
background-image: none;
@@ -110,7 +130,7 @@ $background-radial-opacity: 0.2 !default;
110130
.Layout__content::after {
111131
content: ' ';
112132
display: block;
113-
position: absolute;
133+
position: fixed;
114134
top: 0;
115135
left: 0;
116136
bottom: 0;
@@ -123,7 +143,7 @@ $background-radial-opacity: 0.2 !default;
123143
.Layout__content::before {
124144
content: ' ';
125145
display: block;
126-
position: absolute;
146+
position: fixed;
127147
top: 0;
128148
left: 0;
129149
bottom: 0;
@@ -155,19 +175,18 @@ $background-radial-opacity: 0.2 !default;
155175

156176
span {
157177
color: base.$color-fg;
158-
font-family: $font-family;
178+
font-family: base.$font-family;
159179
font-weight: bold;
160180
}
161181

162182
.Button {
163-
font-family: $font-family;
183+
font-family: base.$font-family;
164184
font-weight: bold;
165185
border: 1px solid base.$color-fg;
166186
&:hover,
167-
&:focus,
168187
&:visited,
169188
&:target {
170-
background-color: base.$color-fg;
189+
background-color: rgba(base.$color-fg, 0.5);
171190
color: base.$color-bg;
172191
}
173192
}
@@ -190,7 +209,7 @@ $background-radial-opacity: 0.2 !default;
190209
}
191210

192211
.Tab__text {
193-
font-family: $font-family;
212+
font-family: base.$font-family;
194213
}
195214

196215
.Tabs--horizontal {

‎tgui/packages/tgui/styles/themes/crt/crt-blue.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
$light: #8ac8ff;
44
$dark: #000011;
55

6-
@use '../../base.scss' with (
6+
@use '../crt.scss' with (
77
$color-bg: $dark,
88
$color-fg: $light
99
);
1010

11-
@use '../crt.scss';
12-
1311
.theme-crtblue {
1412
@extend %theme-crt;
1513

‎tgui/packages/tgui/styles/themes/crt/crt-green.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
$light: #00e94e;
44
$dark: #001100;
55

6-
@use '../../base.scss' with (
6+
@use '../crt.scss' with (
77
$color-bg: $dark,
88
$color-fg: $light
99
);
1010

11-
@use '../crt.scss';
12-
1311
.theme-crtgreen {
1412
@extend %theme-crt;
1513

‎tgui/packages/tgui/styles/themes/crt/crt-yellow.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
$light: #ffbf00;
44
$dark: #111100;
55

6-
@use '../../base.scss' with (
6+
@use '../crt.scss' with (
77
$color-bg: $dark,
88
$color-fg: $light
99
);
1010

11-
@use '../crt.scss';
12-
1311
.theme-crtyellow {
1412
@extend %theme-crt;
1513

‎tgui/public/tgui.html

+10-9
Original file line numberDiff line numberDiff line change
@@ -597,24 +597,25 @@
597597
<!-- Fatal error container -->
598598
<div id="FatalError" class="FatalError">
599599
<div class="FatalError__logo">
600-
ooooo ooo . .oooooo. .oooooo..o
601-
`888b. `8' .o8 d8P' `Y8b d8P' `Y8
602-
8 `88b. 8 .o888oo 888 888 Y88bo.
603-
8 `88b. 8 888 888 888 `"Y8888o.
604-
8 `88b.8 888 888 888 `"Y88b
605-
8 `888 888 . `88b d88' oo .d8P
606-
o8o `8 "888" `Y8bood8P' 8""88888P'
600+
<pre>
601+
___ _ _ _ ___ ___ ___
602+
|_ _|| |_ &lt;_&gt;._ _ | |__| . \| . |/ __&gt;
603+
| | | . || || &#39; || / /| | || | |\__ \
604+
|_| |_|_||_||_|_||_\_\|___/`___&#39;&lt;___/
605+
606+
</pre>
607+
607608
</div>
608609
<marquee class="FatalError__header">
609610
A fatal exception has occurred at 002B:C562F1B7 in TGUI.
610611
The current application will be terminated.
611612
Send the copy of the following stack trace to an authorized
612-
Nanotrasen incident handler at https://github.com/DaedalusDock/Gameserver.
613+
ThinkTronic incident handler at https://github.com/DaedalusDock/Gameserver.
613614
Thank you for your cooperation.
614615
</marquee>
615616
<div id="FatalError__stack" class="FatalError__stack"></div>
616617
<div class="FatalError__footer">
617-
Nanotrasen (c) 2525-2562
618+
Copyright (c) ThinkTronic All Rights Reserved
618619
</div>
619620
</div>
620621

0 commit comments

Comments
 (0)