cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update stylesheet.dm

Browse Source 
Fix upstream conflict
This commit is contained in:
Nadyr
2020-10-22 10:07:34 -04:00
committed by GitHub
parent 6d02d61e54
commit 9450047efe
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/stylesheet.dm
-4
View File
@@ -111,12 +111,8 @@ h1.alert, h2.alert {color: #000000;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.terminus {font-family: "Times New Roman", Times, serif, sans-serif}
.interface {color: #330033;}
<<<<<<< HEAD
.psionic {color: #993399;} /*YWedit*/
||||||| parent of ae8e37f2ca... Merge pull request #9125 from Andromeda-K22/spacefam_speak
=======
.spacer {color: #9c660b;}
>>>>>>> ae8e37f2ca... Merge pull request #9125 from Andromeda-K22/spacefam_speak
BIG IMG.icon {width: 32px; height: 32px;}