ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
ntr 2019-05-14 14:03:31 +10:00
parent c4ec531798
commit a069249d98
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/instance.cryps.jsx
View File

@ -111,15 +111,9 @@ function Cryp(props) {
if (!s) { if (!s) {
const equip = specList.includes(vbox.bound[activeVar]) ? 'equip-spec' : 'gray'; const equip = specList.includes(vbox.bound[activeVar]) ? 'equip-spec' : 'gray';
return ( return (
<<<<<<< HEAD
<figure key={i} className="gray" onClick={blankSpecClick}>
{shapes.diamond('stat-icon gray')}
<figcaption>+</figcaption>
=======
<figure key={i} onClick={blankSpecClick}> <figure key={i} onClick={blankSpecClick}>
{shapes.diamond(`stat-icon ${equip}`)} {shapes.diamond(`stat-icon ${equip}`)}
<figcaption>&nbsp;</figcaption> <figcaption>+</figcaption>
>>>>>>> 2318ff3974d80a7c29246cdc8a3eb1653ea45b91
</figure> </figure>
); );
} }