mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] var/global/list -> GLOB. conversion (#11193)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
6f8cbcf612
commit
2c9453b5c3
@@ -80,15 +80,8 @@
|
||||
.operative .wrap {border-color: #13121b;}
|
||||
.operative .content {color: #b01232; border-color: #13121b; background-color: #282831;}
|
||||
|
||||
<<<<<<< HEAD
|
||||
/* ChompKeep Start */
|
||||
.clockwork .wrap {border-color: #170800;}
|
||||
.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
|
||||
/* ChompKeep End */
|
||||
=======
|
||||
.clockwork .wrap {border-color: #170800;}
|
||||
.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
|
||||
>>>>>>> 2cf86233ca (font awesome update (#17991))
|
||||
|
||||
.trasen-knox .wrap {border-color: #998e81;}
|
||||
.trasen-knox .content {color: #3ce375; border-color: #998e81; background-color: #1e1d21;}
|
||||
|
||||
Reference in New Issue
Block a user