From 5458173a416f4a4282aba77d1d6a8c8d1f9bea55 Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Sun, 29 Oct 2023 19:20:07 -0500
Subject: [PATCH] Move film simulation to core exif block

---
 src/photo/PhotoLarge.tsx                      | 30 ++++++++-----------
 src/site/globals.css                          |  4 +++
 .../fujifilm/PhotoFujifilmSimulation.tsx      | 16 ++++++++--
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/photo/PhotoLarge.tsx b/src/photo/PhotoLarge.tsx
index 6babea86..146bc435 100644
--- a/src/photo/PhotoLarge.tsx
+++ b/src/photo/PhotoLarge.tsx
@@ -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>
diff --git a/src/site/globals.css b/src/site/globals.css
index 71026ab4..242dca91 100644
--- a/src/site/globals.css
+++ b/src/site/globals.css
@@ -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
diff --git a/src/vendors/fujifilm/PhotoFujifilmSimulation.tsx b/src/vendors/fujifilm/PhotoFujifilmSimulation.tsx
index 3bab682b..8c7c78fa 100644
--- a/src/vendors/fujifilm/PhotoFujifilmSimulation.tsx
+++ b/src/vendors/fujifilm/PhotoFujifilmSimulation.tsx
@@ -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>