Skip to content

Commit 088c0ab

Browse files
chatfix+protolate fix
1 parent 79036fa commit 088c0ab

File tree

6 files changed

+64
-14
lines changed

6 files changed

+64
-14
lines changed

tgui/packages/tgui-say/styles/window.scss

+27-8
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,34 @@
2121
background-color: colors.$lightMode;
2222
}
2323

24-
/** Window sizes */
25-
.window-30 {
26-
height: 24px;
27-
}
24+
// Remove conditionals with 516
25+
@supports (not (-webkit-hyphens: none)) and (not (-moz-appearance: none)) {
26+
/** Window sizes */
27+
.window-30 {
28+
height: 24px;
29+
}
30+
31+
.window-50 {
32+
height: 40px;
33+
}
2834

29-
.window-50 {
30-
height: 40px;
35+
.window-70 {
36+
height: 56px;
37+
}
3138
}
3239

33-
.window-70 {
34-
height: 56px;
40+
// Remove with 516
41+
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
42+
/** Window sizes */
43+
.window-30 {
44+
height: 30px;
45+
}
46+
47+
.window-50 {
48+
height: 50px;
49+
}
50+
51+
.window-70 {
52+
height: 70px;
53+
}
3554
}

tgui/packages/tgui/interfaces/Autolathe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export const Autolathe = (props, context) => {
106106
}
107107
return (
108108
<Window width={750} height={525}>
109-
<Window.Content scrollable>
109+
<Window.Content>
110110
<Stack fill horizontal>
111111
<Stack.Item width="70%">
112112
<Section

tgui/packages/tgui/interfaces/RndConsole.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const RndConsole = (properties, context) => {
3737

3838
return (
3939
<Window width={800} height={550} theme={data.ui_theme}>
40-
<Window.Content>
40+
<Window.Content scrollable>
4141
<Box className="RndConsole">
4242
<RndNavbar />
4343
<RndRoute menu={MENU.MAIN} render={() => <MainMenu />} />

tgui/public/tgui-say.bundle.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tgui/public/tgui.bundle.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tgui/public/tgui.html

+32-1
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,37 @@
371371
loadAsset({ url: url, sync: sync, type: 'css' });
372372
};
373373

374+
Byond.saveBlob = function (blob, filename, ext) {
375+
if (window.navigator.msSaveBlob) {
376+
window.navigator.msSaveBlob(blob, filename);
377+
} else if (window.showSaveFilePicker) {
378+
var accept = {};
379+
accept[blob.type] = [ext];
380+
381+
var opts = {
382+
suggestedName: filename,
383+
types: [
384+
{
385+
description: 'SS13 file',
386+
accept: accept,
387+
},
388+
],
389+
};
390+
391+
window
392+
.showSaveFilePicker(opts)
393+
.then(function (file) {
394+
return file.createWritable();
395+
})
396+
.then(function (file) {
397+
return file.write(blob).then(function () {
398+
return file.close();
399+
});
400+
})
401+
.catch(function () {});
402+
}
403+
};
404+
374405
// Icon cache
375406
Byond.iconRefMap = {};
376407
})();
@@ -645,7 +676,7 @@
645676
Произошла фатальная ошибка в секторе 002B:C562F1B7 TGUI. Текущее
646677
приложение будет завершено. Сохраняйте спокойствие. Доберитесь до
647678
ближайшей рабочей станции NTNet и сделайте отчёт по ошибке:
648-
<a
679+
<a
649680
target="_blank"
650681
style="color: white"
651682
href="https://discord.gg/ss1984"

0 commit comments

Comments
 (0)