FIxed merge conflicts with dev and also did some work on Gang UI

This commit is contained in:
danielyxie
2018-10-10 18:13:31 -05:00
30 changed files with 1439 additions and 1065 deletions

View File

@@ -159,6 +159,7 @@ a:visited {
.help-tip {
content: '?';
padding: 1px;
margin-top: 5px;
margin-left: 3px;
color: #fff;
border: 1px solid #fff;