Merge branch 'dev'

merge-requests/9/merge
Bsian 2020-04-21 18:53:28 +01:00
commit aba223f42c
No known key found for this signature in database
GPG Key ID: 097FB9A291026091
2 changed files with 10 additions and 7 deletions

View File

@ -119,11 +119,7 @@ export default class Util {
} }
public decimalToHex(int: number): string { public decimalToHex(int: number): string {
const red = (int && 0x0000ff) << 16; const hex = int.toString(16);
const green = int && 0x00ff00; return '#000000'.substring(0, 7 - hex.length) + hex;
const blue = (int && 0xff0000) >>> 16;
const number = red | green | blue;
const asHex = number.toString(16);
return '#000000'.substring(0, 7 - asHex.length) + asHex;
} }
} }

View File

@ -97,12 +97,19 @@
{ {
"name": "Hector", "name": "Hector",
"id": "377781496292835339", "id": "377781496292835339",
"title": "Core Team", "title": "Associate",
"emailAddress": "hector@staff.libraryofcode.org", "emailAddress": "hector@staff.libraryofcode.org",
"gitlab": "https://gitlab.libraryofcode.org/Hector", "gitlab": "https://gitlab.libraryofcode.org/Hector",
"github": "https://github.com/Hector6704", "github": "https://github.com/Hector6704",
"bio": "Hi there, I'm the developer of Delta, the Discord bot. I'm a free-time French JavaScript developer. I hope you'll enjoy LOC!" "bio": "Hi there, I'm the developer of Delta, the Discord bot. I'm a free-time French JavaScript developer. I hope you'll enjoy LOC!"
}, },
{
"name": "Realitus",
"id": "156450671338586112",
"title": "Associate",
"github": "https://github.com/Realitus",
"bio": "A hobbyist software developer with some rather strange ideas, and even stranger implementations."
},
{ {
"name": "KhaaZ", "name": "KhaaZ",
"id": "179908288337412096", "id": "179908288337412096",