Skip to content

Commit

Permalink
Announcement CSS hotfix [NO GBP] (#79052)
Browse files Browse the repository at this point in the history
## About The Pull Request

I forgot light mode exists half way through making PR
#78995, apparently. Also
fixes the weird spacing on shuttle evac calls and dark mode alert text,
reduces the padding on either side of announcements.


![image](https://github.com/tgstation/tgstation/assets/83487515/3af555c0-24b6-425f-819a-25766e1238ba)


![image](https://github.com/tgstation/tgstation/assets/83487515/f5a1546c-567d-4d42-87af-5f5a1d8dc535)


![image](https://github.com/tgstation/tgstation/assets/83487515/05d9d5a4-7692-44ff-84c6-5abd0a1d915d)


## Changelog

:cl: LT3
spellcheck: More announcement CSS fixes, now including light mode
/:cl:
  • Loading branch information
lessthnthree committed Oct 18, 2023
1 parent 4753113 commit 12308db
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions code/__HELPERS/priority_announce.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
else if(SSstation.announcer.event_sounds[sound])
sound = SSstation.announcer.event_sounds[sound]

announcement += "<br><br>"
announcement += "<br>"

if(type == "Priority")
announcement += "[span_priorityannounce("<u>Priority Announcement</u>")]"
Expand Down Expand Up @@ -69,7 +69,7 @@
else
announcement += "[span_priorityalert("<br>[text]<br>")]"

announcement += "<br><br>"
announcement += "<br>"

if(!players)
players = GLOB.player_list
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ SUBSYSTEM_DEF(shuttle)

call_reason = trim(html_encode(call_reason))

var/emergency_reason = "\nNature of emergency:\n\n[call_reason]"
var/emergency_reason = "\n\nNature of emergency:\n[call_reason]"

emergency.request(
signal_origin = signal_origin,
Expand Down
7 changes: 1 addition & 6 deletions tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -439,33 +439,28 @@ em {
color: #c51e1e;
font-weight: bold;
font-size: 185%;
margin-top: 1rem;
}

.minoralert {
color: #a4bad6;
font-size: 125%;
margin-top: 1rem;
}

.priorityannounce {
color: #a4bad6;
font-weight: bold;
font-size: 225%;
margin-top: 1rem;
}

.prioritytitle {
color: #9ab0ff;
color: #6685f5;
font-weight: bold;
font-size: 185%;
margin-top: 1rem;
}

.priorityalert {
color: #c51e1e;
font-size: 140%;
margin-top: 1rem;
}

.greenannounce {
Expand Down
8 changes: 7 additions & 1 deletion tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,13 @@ h2.alert {
.priorityannounce {
color: #000000;
font-weight: bold;
font-size: 210%;
font-size: 225%;
}

.prioritytitle {
color: #0000ff;
font-weight: bold;
font-size: 185%;
}

.priorityalert {
Expand Down

0 comments on commit 12308db

Please sign in to comment.