roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-04-24 19:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ServerCard): resolve name color regression

Browse source
This commit is contained in:
41666 2020-02-02 14:21:39 -05:00
parent 96d67fd42e
commit 1148a564ac
No known key found for this signature in database
GPG key ID: BC51D07640DC10AF
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/src/components/servers/ServerCard.js
View file

@ -1,6 +1,7 @@
import React, { Component } from 'react'
import ImmutablePropTypes from 'react-immutable-proptypes'
import { NavLink } from 'react-router-dom'
import { colorToCSS } from '../../utils'
import './ServerCard.sass'
class ServerCard extends Component {
@ -59,7 +60,7 @@ class ServerCard extends Component {
<div className="server-list__item__info">
<b>{s.get('name')}</b>
<br />
<span style={{ color: gm.get('color') }}>
<span style={{ color: colorToCSS(gm.get('color')) }}>
{gm.get('nick') || user.get('username')}
</span>{' '}
{icon}

4
UI/src/utils.js
View file

@ -1 +1,5 @@
import color from 'color'
export const msgToReal = msg => msg.replace(/</g, '&lt;').replace(/\n/g, '<br />')
export const colorToCSS = colorInt => color(colorInt).hsl().string()