themes-works-now

This commit is contained in:
Letter N
2020-12-01 14:50:38 +08:00
parent 19396801f7
commit b7ab84d144
7 changed files with 97 additions and 91 deletions

54
.gitattributes vendored
View File

@@ -1,15 +1,43 @@
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
# *.dmm merge=merge-dmm
# dmi icon merger hook
# needs additional setup, see tools/dmitool/merging.txt
*.dmi merge=merge-dmi
# force changelog merging to use union
html/changelog.html merge=union
# enforced LF
* text=auto
*.<ext> merge=<ext>
## Enforce text mode and LF line breaks
*.bat text eol=lf
*.css text eol=lf
*.css text eol=lf
# *.dm text eol=lf
*.dme text eol=lf
*.dmf text eol=lf
*.htm text eol=lf
*.html text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.jsx text eol=lf
*.md text eol=lf
*.py text eol=lf
*.scss text eol=lf
*.sh text eol=lf
*.sql text eol=lf
*.svg text eol=lf
*.ts text eol=lf
*.tsx text eol=lf
*.txt text eol=lf
*.yaml text eol=lf
*.yml text eol=lf
## Enforce binary mode
*.bmp binary
*.dll binary
*.dmb binary
*.exe binary
*.gif binary
*.jpg binary
*.png binary
*.so binary
## Merger hooks, run tools/hooks/install.bat or install.sh to set up
*.dmm text eol=lf merge=dmm
*.dmi binary merge=dmi
## Force changelog merging to use union
html/changelog.html text eol=lf merge=union

View File

@@ -1,8 +1,9 @@
{
"recommendations": [
"gbasood.byond-dm-language-support",
"platymuus.dm-langclient",
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint"
]
}
{
"recommendations": [
"gbasood.byond-dm-language-support",
"platymuus.dm-langclient",
"EditorConfig.EditorConfig",
"arcanis.vscode-zipfs",
"dbaeumer.vscode-eslint"
]
}

15
.vscode/launch.json vendored
View File

@@ -1,15 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "dm: build - ${command:CurrentDME}",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
}
]
}

10
.vscode/settings.json vendored
View File

@@ -1,12 +1,18 @@
{
"eslint.nodePath": "tgui/.yarn/sdks",
"eslint.workingDirectories": [
"./tgui"
],
"search.exclude": {
"tgui/.yarn": true,
"tgui/.pnp.*": true
},
"workbench.editorAssociations": [
{
"filenamePattern": "*.dmi",
"viewType": "imagePreview.previewEditor"
}
]
],
"files.eol": "\n",
"gitlens.advanced.blame.customArguments": ["-w"]
}

View File

@@ -73,19 +73,19 @@ export const setClientTheme = name => {
'output.text-color': COLOR_WHITE_TEXT,
'statwindow.background-color': COLOR_WHITE_DARKBG,
'statwindow.text-color': COLOR_WHITE_TEXT,
'stat.background-color': COLOR_WHITE_BG,
'stat.tab-background-color': COLOR_WHITE_DARKBG,
'stat.text-color': COLOR_WHITE_TEXT,
'stat.tab-text-color': COLOR_WHITE_TEXT,
'stat.prefix-color': COLOR_WHITE_TEXT,
'stat.suffix-color': COLOR_WHITE_TEXT,
'statbrowser.background-color': COLOR_WHITE_BG,
'statbrowser.tab-background-color': COLOR_WHITE_DARKBG,
'statbrowser.text-color': COLOR_WHITE_TEXT,
'statbrowser.tab-text-color': COLOR_WHITE_TEXT,
'statbrowser.prefix-color': COLOR_WHITE_TEXT,
'statbrowser.suffix-color': COLOR_WHITE_TEXT,
// Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_WHITE_DARKBG,
'saybutton.text-color': COLOR_WHITE_TEXT,
// 'oocbutton.background-color': COLOR_WHITE_DARKBG,
// 'oocbutton.text-color': COLOR_WHITE_TEXT,
// 'mebutton.background-color': COLOR_WHITE_DARKBG,
// 'mebutton.text-color': COLOR_WHITE_TEXT,
'oocbutton.background-color': COLOR_WHITE_DARKBG,
'oocbutton.text-color': COLOR_WHITE_TEXT,
'mebutton.background-color': COLOR_WHITE_DARKBG,
'mebutton.text-color': COLOR_WHITE_TEXT,
'asset_cache_browser.background-color': COLOR_WHITE_DARKBG,
'asset_cache_browser.text-color': COLOR_WHITE_TEXT,
'tooltip.background-color': COLOR_WHITE_BG,
@@ -123,19 +123,19 @@ export const setClientTheme = name => {
'output.text-color': COLOR_DARK_TEXT,
'statwindow.background-color': COLOR_DARK_DARKBG,
'statwindow.text-color': COLOR_DARK_TEXT,
'stat.background-color': COLOR_DARK_DARKBG,
'stat.tab-background-color': COLOR_DARK_BG,
'stat.text-color': COLOR_DARK_TEXT,
'stat.tab-text-color': COLOR_DARK_TEXT,
'stat.prefix-color': COLOR_DARK_TEXT,
'stat.suffix-color': COLOR_DARK_TEXT,
'statbrowser.background-color': COLOR_DARK_DARKBG,
'statbrowser.tab-background-color': COLOR_DARK_BG,
'statbrowser.text-color': COLOR_DARK_TEXT,
'statbrowser.tab-text-color': COLOR_DARK_TEXT,
'statbrowser.prefix-color': COLOR_DARK_TEXT,
'statbrowser.suffix-color': COLOR_DARK_TEXT,
// Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_DARK_BG,
'saybutton.text-color': COLOR_DARK_TEXT,
// 'oocbutton.background-color': COLOR_DARK_BG,
// 'oocbutton.text-color': COLOR_DARK_TEXT,
// 'mebutton.background-color': COLOR_DARK_BG,
// 'mebutton.text-color': COLOR_DARK_TEXT,
'oocbutton.background-color': COLOR_DARK_BG,
'oocbutton.text-color': COLOR_DARK_TEXT,
'mebutton.background-color': COLOR_DARK_BG,
'mebutton.text-color': COLOR_DARK_TEXT,
'asset_cache_browser.background-color': COLOR_DARK_BG,
'asset_cache_browser.text-color': COLOR_DARK_TEXT,
'tooltip.background-color': COLOR_DARK_BG,
@@ -173,19 +173,19 @@ export const setClientTheme = name => {
'output.text-color': COLOR_DARK_TEXT,
'statwindow.background-color': COLOR_DARK_DARKBG,
'statwindow.text-color': COLOR_DARK_TEXT,
'stat.background-color': COLOR_DARK_DARKBG,
'stat.tab-background-color': COLOR_DARK_BG,
'stat.text-color': COLOR_DARK_TEXT,
'stat.tab-text-color': COLOR_DARK_TEXT,
'stat.prefix-color': COLOR_DARK_TEXT,
'stat.suffix-color': COLOR_DARK_TEXT,
'statbrowser.background-color': COLOR_DARK_DARKBG,
'statbrowser.tab-background-color': COLOR_DARK_BG,
'statbrowser.text-color': COLOR_DARK_TEXT,
'statbrowser.tab-text-color': COLOR_DARK_TEXT,
'statbrowser.prefix-color': COLOR_DARK_TEXT,
'statbrowser.suffix-color': COLOR_DARK_TEXT,
// Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_DARK_BG,
'saybutton.text-color': COLOR_DARK_TEXT,
// 'oocbutton.background-color': COLOR_DARK_BG,
// 'oocbutton.text-color': COLOR_DARK_TEXT,
// 'mebutton.background-color': COLOR_DARK_BG,
// 'mebutton.text-color': COLOR_DARK_TEXT,
'oocbutton.background-color': COLOR_DARK_BG,
'oocbutton.text-color': COLOR_DARK_TEXT,
'mebutton.background-color': COLOR_DARK_BG,
'mebutton.text-color': COLOR_DARK_TEXT,
'asset_cache_browser.background-color': COLOR_DARK_BG,
'asset_cache_browser.text-color': COLOR_DARK_TEXT,
'tooltip.background-color': COLOR_DARK_BG,

File diff suppressed because one or more lines are too long

View File

@@ -281,34 +281,20 @@ if (!Function.prototype.bind) (function () {
<!-- Fatal error container -->
<div id="FatalError" style="display: none">
<div class="FatalError__logo">
_____ _____ _______ _____
/\ \ /\ \ /::\ \ /\ \
/::\____\ /::\ \ /::::\ \ /::\ \
/::::| | \:::\ \ /::::::\ \ /::::\ \
/:::::| | \:::\ \ /::::::::\ \ /::::::\ \
/::::::| | \:::\ \ /:::/~~\:::\ \ /:::/\:::\ \
/:::/|::| | \:::\ \ /:::/ \:::\ \ /:::/__\:::\ \
/:::/ |::| | /::::\ \ /:::/ / \:::\ \ \:::\ \:::\ \
/:::/ |::| | _____ /::::::\ \ /:::/____/ \:::\____\ ___\:::\ \:::\ \
/:::/ |::| |/\ \ /:::/\:::\ \|:::| | |:::| |/\ \:::\ \:::\ \
/:: / |::| /::\____\/:::/ \:::\____\:::|____| |:::| /::\ \:::\ \:::\____\
\::/ /|::| /:::/ /:::/ \::/ /\:::\ \ /:::/ /\:::\ \:::\ \::/ /
\/____/ |::| /:::/ /:::/ / \/____/ \:::\ \ /:::/ / \:::\ \:::\ \/____/
|::|/:::/ /:::/ / \:::\ /:::/ / \:::\ \:::\ \
|::::::/ /:::/ / \:::\__/:::/ / \:::\ \:::\____\
|:::::/ /\::/ / \::::::::/ / \:::\ /:::/ /
|::::/ / \/____/ \::::::/ / \:::\/:::/ /
/:::/ / \::::/ / \::::::/ /
/:::/ / \::/____/ \::::/ /
\::/ / \::/ /
\/____/ \/____/
ooooo ooo . .oooooo. .oooooo..o
`888b. `8' .o8 d8P' `Y8b d8P' `Y8
8 `88b. 8 .o888oo 888 888 Y88bo.
8 `88b. 8 888 888 888 `"Y8888o.
8 `88b.8 888 888 888 `"Y88b
8 `888 888 . `88b d88' oo .d8P
o8o `8 "888" `Y8bood8P' 8""88888P'
</div>
<marquee class="FatalError__header">
A fatal exception has occurred at 002B:C562F1B7 in TGUI.
The current application will be terminated.
Please remain calm. Get to the nearest NTNet workstation
and send the copy of the following stack trace to:
www.github.com/tgstation/tgstation. Thank you for your cooperation.
www.github.com/Citadel-Station-13/Citadel-Station-13-RP/issues. Thank you for your cooperation.
</marquee>
<div id="FatalError__stack" class="FatalError__stack"></div>
<div class="FatalError__footer">