diff --git a/css/styles.css b/css/styles.css index 75f0e45..1f7712d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -811,10 +811,10 @@ p { margin: 0 0 1em; color: var(--text-muted); } } .proper-image--fruit .proper-image__img { - object-fit: contain; + object-fit: cover; object-position: center; - padding: 8%; - background: radial-gradient(circle at 50% 45%, rgba(255,255,255,0.08), #0b1220 70%); + padding: 0; + background: #0b1220; } .proper-image.is-loaded .proper-image__fallback { opacity: 0; } diff --git a/js/app.js b/js/app.js index 041ab15..ba52a8b 100644 --- a/js/app.js +++ b/js/app.js @@ -74,6 +74,16 @@ function statusBadgeClass(status) { return 'badge--unknown'; } +function characterPosterLabel(c) { + if (c.bounty !== null && c.bounty !== undefined) return 'WANTED'; + if (/marine/i.test(c.affiliation || '')) return 'MARINE'; + return (c.affiliation || c.role || 'UNKNOWN').split(/[/(]/)[0].trim().toUpperCase(); +} + +function characterBountyOrRank(c) { + return c.bounty !== null && c.bounty !== undefined ? formatBounty(c.bounty) : c.role || 'Rank unknown'; +} + function characterCardHTML(c) { const accent = accentFor(c); const deadRibbon = /deceased/i.test(c.status || '') ? 'Deceased' : ''; @@ -83,13 +93,13 @@ function characterCardHTML(c) { ${deadRibbon} - WANTED + ${escapeHtml(characterPosterLabel(c))} ${characterPortraitSVG(c)} ${escapeHtml(c.name)} ${c.epithet ? '"' + escapeHtml(c.epithet) + '"' : ' '} - ${c.bounty ? formatBounty(c.bounty) : 'Bounty Unknown'} + ${escapeHtml(characterBountyOrRank(c))} ${escapeHtml(c.affiliation)} ${fruitTag} diff --git a/js/character.js b/js/character.js index 2b0ca23..fbc2134 100644 --- a/js/character.js +++ b/js/character.js @@ -42,7 +42,7 @@ ${character.epithet ? '"' + escapeHtml(character.epithet) + '"' : ''} ${escapeHtml(character.status || 'Unknown')} - ${character.bounty ? formatBounty(character.bounty) : 'Bounty Unknown'} + ${escapeHtml(characterBountyOrRank(character))} ${fruit ? `${escapeHtml(fruit.category)} User` : ''}
${c.epithet ? '"' + escapeHtml(c.epithet) + '"' : ' '}
${c.bounty ? formatBounty(c.bounty) : 'Bounty Unknown'}
${escapeHtml(characterBountyOrRank(c))}
${character.epithet ? '"' + escapeHtml(character.epithet) + '"' : ''}