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.

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

Announcements colors tweak #38

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6a9736e
Update .gitattributes
MrCastmer Feb 29, 2024
9072537
Revert "Update .gitattributes"
MrCastmer Feb 29, 2024
04f222e
colors
MrCastmer Mar 27, 2024
0681269
Merge branch 'master' into announcements-colors-tweak
MrCastmer Mar 27, 2024
8eb5a7e
Merge branch 'master' into announcements-colors-tweak
Blundir Mar 27, 2024
110abd6
Merge branch 'master' into announcements-colors-tweak
MrCastmer Mar 27, 2024
fa15c46
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 6, 2024
db156d7
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 9, 2024
f4ba666
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 9, 2024
08968fe
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 10, 2024
d4ac58c
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 12, 2024
8874b84
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 12, 2024
c38b9a3
Merge branch 'master' into announcements-colors-tweak
Blundir Apr 19, 2024
413591b
Merge branch 'master' into announcements-colors-tweak
Blundir Apr 19, 2024
a591068
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 26, 2024
088c37b
Merge branch 'master' into announcements-colors-tweak
MrCastmer Apr 26, 2024
9f4c130
Merge branch 'master' into announcements-colors-tweak
MrCastmer Jul 18, 2024
8997be4
Merge branch 'master' into announcements-colors-tweak
MrCastmer Jul 18, 2024
0fcd417
Merge branch 'master' into announcements-colors-tweak
MrCastmer Aug 8, 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
32 changes: 32 additions & 0 deletions tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -967,9 +967,14 @@ em {
}

$alert-stripe-colors: (
/*Dripstation edit
'default': #00283a,
'green': #003d00,
'blue': #00283a,
*/
'default': #051e44,
'green': #004700,
'blue': #071d4b,
'pink': #30001b,
'yellow': #574a00,
'orange': #593400,
Expand All @@ -979,9 +984,14 @@ $alert-stripe-colors: (
);

$alert-stripe-alternate-colors: (
/*Dripstation edit
'default': #003045,
'green': #004700,
'blue': #003045,
*/
'default': #03234d,
'green': #003d00,
'blue': #04193f,
'pink': #400025,
'yellow': #4d4100,
'orange': #6b4200,
Expand All @@ -991,6 +1001,7 @@ $alert-stripe-alternate-colors: (
);

$alert-major-header-colors: (
/*Dripstation edit
'default': #33d5ff,
'green': #00ff80,
'blue': #33d5ff,
Expand All @@ -1000,9 +1011,20 @@ $alert-major-header-colors: (
'red': #ff5297,
'purple': #c7a1f7,
'grey': #ff5297,
*/
'default': #2155b4,
'green': #0e812b,
'blue': #1d4d96,
'pink': #91033c,
'yellow': #b47c22,
'orange': #b3511d,
'red': #a00627,
'purple': #5c21aa,
'grey': #800033,
);

$alert-subheader-header-colors: (
/*Dripstation edit
'default': #ff5297,
'green': #ff85b5,
'blue': #ff5297,
Expand All @@ -1012,6 +1034,16 @@ $alert-subheader-header-colors: (
'red': #33d5ff,
'purple': #33d5ff,
'grey': #33d5ff,
*/
'default': #2457b6,
'green': #da911c,
'blue': #ccba17,
'pink': #3c1dad,
'yellow': #da911c,
'orange': #ccba17,
'red': #b30522,
'purple': #b805c9,
'grey': #045699,
);

$border-width: 4;
Expand Down
39 changes: 39 additions & 0 deletions tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,7 @@ h2.alert {
}

$alert-stripe-colors: (
/*Dripstation edit
'default': #b3bfff,
'green': #adffad,
'blue': #b3bfff,
Expand All @@ -1003,9 +1004,20 @@ $alert-stripe-colors: (
'red': #ffb3b3,
'purple': #fac2ff,
'grey': #e3e3e3,
*/
'default': #033f83,
'green': #109010,
'blue': #103f6e,
'pink': #e279b6,
'yellow': #ffe760,
'orange': #da911c,
'red': #ff0000,
'purple': #f18ffa,
'grey': #cfcfcf,
);

$alert-stripe-alternate-colors: (
/*Dripstation edit
'default': #bdc8ff,
'green': #bdffbd,
'blue': #bdc8ff,
Expand All @@ -1015,21 +1027,38 @@ $alert-stripe-alternate-colors: (
'red': #ffc2c2,
'purple': #fbd1ff,
'grey': #ebebeb,
*/
'default': #022d5e,
'green': #077907,
'blue': #072d53,
'pink': #c5639c,
'yellow': #c5b03b,
'orange': #996107,
'red': #bb0202,
'purple': #b805c9,
'grey': #adadad,
);

$alert-major-header-colors: (
/*Dripstation edit
'default': #003061,
*/
'default': #022450,
'green': #005229,
'blue': #003061,
'pink': #800033,
'yellow': #754900,
'orange': #823208,
/*Dripstation edit
'red': #800029,
*/
'red': #800000,
'purple': #450d8c,
'grey': #800033,
);

$alert-subheader-header-colors: (
/*Dripstation edit
'default': #6b0020,
'green': #6b0020,
'blue': #6b0020,
Expand All @@ -1039,6 +1068,16 @@ $alert-subheader-header-colors: (
'red': #002c85,
'purple': #002c85,
'grey': #002c85,
*/
'default': #183874,
'green': #7e5411,
'blue': #80740f,
'pink': #30178b,
'yellow': #805612,
'orange': #70660d,
'red': #7e0419,
'purple': #880794,
'grey': #033966,
);

$border-width: 4;
Expand Down
Loading