Skip to content

Commit 1bcfac9

Browse files
committed
feat(license-plate): fix merged branch errors
1 parent 26df8bc commit 1bcfac9

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

src/components/LicensePlate.tsx

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ const LicensePlate = forwardRef<HTMLDivElement, LicensePlateProps>(
168168
const textColor = fontColor;
169169
const plateBgColor = backgroundColor;
170170
const danishBorderColor = '#C8102E';
171-
const plateBorderColor = (country === 'DK' || country === 'B') ? danishBorderColor : country === 'A' ? 'transparent' : styles.borderColor;
171+
const plateBorderColor = (country === 'DK' || country === 'B') ? danishBorderColor : (country === 'A' || country === 'HR') ? 'transparent' : styles.borderColor;
172172
const redStripeHeight = 2 * scale;
173173
const hasUkBand = country === 'GB' && (showUKFlag || isEV);
174174
const ukBandWidth = hasUkBand ? 40 * scale : 0; // UK band width when shown
@@ -370,8 +370,9 @@ const LicensePlate = forwardRef<HTMLDivElement, LicensePlateProps>(
370370
width: `${plateWidth}px`,
371371
height: `${plateHeight}px`,
372372
backgroundColor: plateBgColor,
373-
border: `${borderWidth}px solid ${(country === 'A' || country === 'HR') ? 'transparent' : styles.borderColor}`,
373+
border: `${borderWidth}px solid ${plateBorderColor}`,
374374
borderRadius: `${8 * scale}px`,
375+
padding: `${framePadding}px`,
375376
fontFamily: getFontFamily(),
376377
transformStyle: 'preserve-3d',
377378
overflow: 'hidden',
@@ -523,23 +524,22 @@ const LicensePlate = forwardRef<HTMLDivElement, LicensePlateProps>(
523524
)}
524525
</div>
525526
</div>
526-
</div>
527-
) : (
528-
/* Standard EU Band */
529-
<div style={{
530-
position: 'absolute',
531-
left: 0,
532-
top: (country === 'A' || country === 'HR') ? `${redStripeHeight * 3}px` : 0,
533-
bottom: (country === 'A' || country === 'HR') ? `${redStripeHeight * 3}px` : 0,
534-
width: `${euBandWidth}px`,
535-
display: 'flex',
536-
alignItems: 'center',
537-
justifyContent: 'center',
538-
padding: (country === 'A' || country === 'HR') ? `0 ${3 * scale}px` : '0',
539-
zIndex: 2,
540-
}}>
541-
<EUBand scale={scale} countryCode={country} height={(country === 'A' || country === 'HR') ? '100%' : undefined} noBorderRadius={(country === 'A' || country === 'HR')} showDinGepruft={country === 'D'} borderRadius={5} />
542-
</div>
527+
) : (
528+
/* Standard EU Band */
529+
<div style={{
530+
position: 'absolute',
531+
left: `${framePadding}px`,
532+
top: (country === 'A' || country === 'HR') ? `${redStripeHeight * 3 + framePadding}px` : `${framePadding}px`,
533+
bottom: (country === 'A' || country === 'HR') ? `${redStripeHeight * 3 + framePadding}px` : `${framePadding}px`,
534+
width: `${euBandWidth}px`,
535+
display: 'flex',
536+
alignItems: 'center',
537+
justifyContent: 'center',
538+
zIndex: 2,
539+
}}>
540+
<EUBand scale={scale} countryCode={country} height="100%" noBorderRadius={(country === 'A' || country === 'HR')} showDinGepruft={country === 'D'} borderRadius={5} />
541+
</div>
542+
)
543543
)}
544544

545545
{/* UK Band - with flag and UK text, green for EV */}

0 commit comments

Comments
 (0)