Move film simulation to core exif block

This commit is contained in:
Sam Becker 2023-10-29 19:20:07 -05:00
parent f058cba263
commit 5458173a41
3 changed files with 29 additions and 21 deletions

View File

@ -75,35 +75,29 @@ export default function PhotoLarge({
<PhotoTags tags={tagsToShow} />}
</div>
{showCamera && photoHasCameraData(photo) &&
<div>
<PhotoCamera
camera={camera}
showIcon={false}
hideApple={false}
/>
{photo.filmSimulation &&
<>
<br />
<PhotoFujifilmSimulation
simulation={photo.filmSimulation}
/>
</>}
</div>}
<PhotoCamera
camera={camera}
showIcon={false}
hideApple={false}
/>}
</>)}
{renderMiniGrid(<>
{photoHasExifData(photo) &&
<ul className="text-medium">
{photo.filmSimulation &&
<li>
<PhotoFujifilmSimulation
simulation={photo.filmSimulation}
/>
</li>}
<li>
{photo.focalLengthFormatted}
{photo.focalLengthIn35MmFormatFormatted &&
<>
{' '}
<span
className={cc(
'text-gray-400/80',
'dark:text-gray-400/50',
)}
title="35mm equivalent"
className="text-extra-dim"
>
{photo.focalLengthIn35MmFormatFormatted}
</span>

View File

@ -120,6 +120,10 @@
@apply
text-gray-400 dark:text-gray-500
}
.text-extra-dim {
@apply
text-gray-400/80 dark:text-gray-400/50
}
.text-icon {
@apply
text-gray-800 dark:text-gray-200

View File

@ -20,9 +20,19 @@ export default function PhotoFujifilmSimulation({
'text-medium uppercase',
)}
>
<span className="xs:hidden">{small}</span>
<span className="hidden xs:inline-block">{medium}</span>
<span className="translate-y-[-1.25px]">
<span className={cc(
'xs:hidden',
small.endsWith('.') && '-mr-1',
)}>
{small}
</span>
<span className={cc(
'hidden xs:inline-block',
medium.endsWith('.') && '-mr-1',
)}>
{medium}
</span>
<span className="translate-y-[-1.25px] text-extra-dim">
<PhotoFujifilmSimulationIcon simulation={simulation} />
</span>
</span>