Merge pull request #126 from Fluffy-Frontier/upstream-mirror-24413

[TG Mirror] Announcement CSS hotfix [NO GBP] [MDB IGNORE]
Fluffy-Frontier · Oct 18, 2023 · 7555c80 · 7555c80
2 parents f14a33d + ef32de7
commit 7555c80
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm
@@ -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>")]"
@@ -69,7 +69,7 @@
 	else
 		announcement += "[span_priorityalert("<br>[text]<br>")]"
 
-	announcement += "<br><br>"
+	announcement += "<br>"
 
 	if(!players)
 		players = GLOB.player_list

diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
@@ -370,7 +370,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,

diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -440,33 +440,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 {

diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -482,7 +482,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 {