From b11f08b91662da0adac9aec5bb089d92b02c6ae6 Mon Sep 17 00:00:00 2001 From: HugoLuman Date: Wed, 20 Apr 2016 15:10:52 -0700 Subject: [PATCH] Attempts to fix the merge conflict God I hope this works Moved the Drask's line up, away from the abductor's Signed-off-by: HugoLuman --- interface/stylesheet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 259c5d3ff49..a45f9d1798a 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -90,10 +90,10 @@ h1.alert, h2.alert {color: #000000;} .trinary {color: #727272;} .kidan {color: #664205;} .slime {color: #0077AA;} +.drask {color: #a3d4eb; font-family: "Arial Black";} .clown {color: #ff0000;} .shadowling {color: #3b2769;} .vulpkanin {color: #B97A57;} -.drask {color: #a3d4eb; font-family: "Arial Black";} .abductor {color: #800080;} .rough {color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;}