Fix small trophy position

This commit is contained in:
ryo-ma 2020-08-25 23:40:15 +09:00
parent c426484370
commit a5ea46790b
2 changed files with 10 additions and 10 deletions

View file

@ -1,7 +1,7 @@
import { RANK } from "./utils.ts"; import { RANK } from "./utils.ts";
const goldColor = "#FFD700"; const goldColor = "#FAD200";
const silverColor = "#C0C0C0"; const silverColor = "#B0B0B0";
const bronzeColor = "#816D46"; const bronzeColor = "#816D46";
const leafIcon = const leafIcon =
`<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="90pt" height="90pt" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid meet"> `<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="90pt" height="90pt" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid meet">
@ -27,11 +27,11 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017
</g> </g>
</svg>`; </svg>`;
function getSmallTropyIcon(icon: string, color: string, count: number): string { function getSmallTrophyIcon(icon: string, color: string, count: number): string {
const leftXPosition = 2; const leftXPosition = 4;
const rightXPosition = 73; const rightXPosition = 71;
const getIcon = (x: number) => { const getIcon = (x: number) => {
return `<svg x="${x}" y="30" width="65" height="65" viewBox="0 0 30 30" class="bi bi-trophy" fill="${color}" xmlns="http://www.w3.org/2000/svg"> return `<svg x="${x}" y="35" width="65" height="65" viewBox="0 0 30 30" class="bi bi-trophy" fill="${color}" xmlns="http://www.w3.org/2000/svg">
${icon} ${icon}
</svg>` </svg>`
}; };
@ -46,7 +46,7 @@ function getSmallTropyIcon(icon: string, color: string, count: number): string {
return '' return ''
} }
export function getTropyIcon(rank = RANK.UNKNOWN) { export function getTrophyIcon(rank = RANK.UNKNOWN) {
const icon = ` const icon = `
<path d="M3 1h10c-.495 3.467-.5 10-5 10S3.495 4.467 3 1zm0 15a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1H3zm2-1a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1H5z"/> <path d="M3 1h10c-.495 3.467-.5 10-5 10S3.495 4.467 3 1zm0 15a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1H3zm2-1a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1H5z"/>
<path fill-rule="evenodd" d="M12.5 3a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-3 2a3 3 0 1 1 6 0 3 3 0 0 1-6 0zm-6-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-3 2a3 3 0 1 1 6 0 3 3 0 0 1-6 0z"/> <path fill-rule="evenodd" d="M12.5 3a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-3 2a3 3 0 1 1 6 0 3 3 0 0 1-6 0zm-6-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-3 2a3 3 0 1 1 6 0 3 3 0 0 1-6 0z"/>
@ -67,7 +67,7 @@ export function getTropyIcon(rank = RANK.UNKNOWN) {
} else if (rank === RANK.B) { } else if (rank === RANK.B) {
color = bronzeColor; color = bronzeColor;
} }
const optionRankIcon = getSmallTropyIcon(icon, color, rank.length - 1); const optionRankIcon = getSmallTrophyIcon(icon, color, rank.length - 1);
return ` return `
${backgroundIcon} ${backgroundIcon}
${optionRankIcon} ${optionRankIcon}

View file

@ -1,4 +1,4 @@
import { getTropyIcon } from "./icons.ts"; import { getTrophyIcon } from "./icons.ts";
import { CONSTANTS, RANK, abridgeScore } from "./utils.ts"; import { CONSTANTS, RANK, abridgeScore } from "./utils.ts";
export abstract class Trophy { export abstract class Trophy {
@ -31,7 +31,7 @@ export abstract class Trophy {
fill="#fff" fill="#fff"
stroke-opacity="1" stroke-opacity="1"
/> />
${getTropyIcon(this.rank)} ${getTrophyIcon(this.rank)}
<text x="50%" y="18" text-anchor="middle" font-family="Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;" font-weight="bold" font-size="12" fill="#000">${this.title}</text> <text x="50%" y="18" text-anchor="middle" font-family="Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;" font-weight="bold" font-size="12" fill="#000">${this.title}</text>
<text x="50%" y="85" text-anchor="middle" font-family="Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;" font-weight="bold" font-size="9.5" fill="#666">${this.topMessage}</text> <text x="50%" y="85" text-anchor="middle" font-family="Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;" font-weight="bold" font-size="9.5" fill="#666">${this.topMessage}</text>
<text x="50%" y="99" text-anchor="middle" font-family="Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;" font-weight="bold" font-size="9" fill="#666">${this.bottomMessage}</text> <text x="50%" y="99" text-anchor="middle" font-family="Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;" font-weight="bold" font-size="9" fill="#666">${this.bottomMessage}</text>