fix: make <kbd> displays consistent

web/static/style.css

@@ -483,7 +483,7 @@ h1 {
 }
 
 /* Keys draw as keycaps. A key combination is an outer kbd wrapping one kbd per
-   key, like <kbd><kbd>Ctrl</kbd> + <kbd>k</kbd></kbd>, and draws no cap itself. */
+   key, like <kbd><kbd>Ctrl</kbd> <kbd>k</kbd></kbd>, and draws no cap itself. */
 kbd {
   display: inline-block;
   padding: 0.05em 0.4em;

web/template/field_report.templ

@@ -183,7 +183,7 @@ templ FieldReport(deployment, versionName, versionRef, eventName string) {
                       class="btn btn-default btn-sm my-1 btn-block disabled no-print"
                       onclick="submitReportEntry()"
               >
-                Add Entry <kbd><kbd class="modifier-key">Ctrl</kbd> + <kbd>Enter</kbd></kbd>
+                Add Entry <kbd><kbd class="modifier-key">Ctrl</kbd> <kbd>Enter</kbd></kbd>
               </button>
               <!-- File attachment -->
               <label class="input-group-text hidden" for="attach_file_input">Attach file</label>

web/template/goto_modal.templ

@@ -43,7 +43,7 @@ templ GoToModal() {
       </div>
       <div id="goto-preview" class="form-text text-truncate" aria-live="polite"></div>
       <p class="mt-2 mb-0 small text-body-secondary">
-        <kbd>Enter</kbd> to go there, <kbd><kbd class="modifier-key">Ctrl</kbd> + <kbd>Enter</kbd></kbd> to open it in a new tab
+        <kbd>Enter</kbd> to go there, <kbd><kbd class="modifier-key">Ctrl</kbd> <kbd>Enter</kbd></kbd> to open it in a new tab
       </p>
     </div>
   </div>

web/template/help.templ

@@ -162,7 +162,7 @@ templ Help(deployment, versionName, versionRef string) {
   <li><strong>Location</strong>: where it happened, with separate <strong>Name</strong>, <strong>Address</strong>, and <strong>Details</strong> fields. Start typing a camp or art name in <strong>Name</strong> and IMS suggests matches from <a href="#places">Places</a> and fills in the address automatically; you can also type an address by hand. Put anything extra (a landmark, a specific tent) in <strong>Details</strong>. An address you type by hand may get tidied up on save; see <a href="#addresses">How addresses are tidied up</a>. The card header has a <strong>Places</strong> link to the Places reference and, where a map is configured for the event, a <strong>Map</strong> link.</li>
   <li><strong>Attached Field Reports/Visits</strong>: Field Reports and Sanctuary Visits related to this Incident. Attaching them makes their contents visible from the Incident. See <a href="#incident-attachments">Attaching Field Reports, Visits, and files</a>.</li>
   <li><strong>Linked Incidents</strong>: related Incidents, even from other years, so you can hop between them. See <a href="#incident-linking">Linking related Incidents</a>.</li>
-  <li><strong>Entries</strong>: the running narrative. Type in the box at the bottom and click <strong>Add Entry</strong> (or press <kbd><kbd>Ctrl</kbd> + <kbd>Enter</kbd></kbd>, or <kbd><kbd>⌘</kbd> + <kbd>Enter</kbd></kbd> on a Mac) to add a timestamped entry. This is where the story of the Incident lives: what was reported, what Rangers did, how it resolved. Where file attachments are enabled, you can also attach a photo or file to an entry with the <strong>Attach file</strong> button.</li>
+  <li><strong>Entries</strong>: the running narrative. Type in the box at the bottom and click <strong>Add Entry</strong> (or press <kbd><kbd>Ctrl</kbd> <kbd>Enter</kbd></kbd>, or <kbd><kbd>⌘</kbd> <kbd>Enter</kbd></kbd> on a Mac) to add a timestamped entry. This is where the story of the Incident lives: what was reported, what Rangers did, how it resolved. Where file attachments are enabled, you can also attach a photo or file to an entry with the <strong>Attach file</strong> button.</li>
 </ul>
 <p>
   Check <strong>Show history and stricken</strong> above the entries to also see system-generated
@@ -381,7 +381,7 @@ templ Help(deployment, versionName, versionRef string) {
 <h2 id="printing" class="h4 mt-4">Printing</h2>
 <p>
   Incidents, Field Reports, and Visits are designed to print cleanly: use your browser's print
-  command (usually <kbd><kbd>Ctrl</kbd> + <kbd>P</kbd></kbd>, or <kbd><kbd>⌘</kbd> + <kbd>P</kbd></kbd>
+  command (usually <kbd><kbd>Ctrl</kbd> <kbd>P</kbd></kbd>, or <kbd><kbd>⌘</kbd> <kbd>P</kbd></kbd>
   on a Mac) and the editing controls and buttons are left off the printout, so you
   get a readable paper copy of the record. If you want the history and stricken entries to
   appear on the printout, turn on <strong>Show history and stricken</strong> before printing.
@@ -416,8 +416,8 @@ templ Help(deployment, versionName, versionRef string) {
   <li><kbd>/</kbd>: jump to the search box</li>
   <li><kbd>a</kbd>: jump to the box for adding a new entry</li>
   <li><kbd>h</kbd>: toggle showing history and stricken entries</li>
-  <li><kbd><kbd>Ctrl</kbd> + <kbd>Enter</kbd></kbd> (or <kbd><kbd>⌘</kbd> + <kbd>Enter</kbd></kbd> on a Mac): submit the entry you're writing</li>
-  <li><kbd><kbd>Ctrl</kbd> + <kbd>k</kbd></kbd> (or <kbd><kbd>⌘</kbd> + <kbd>K</kbd></kbd> on a Mac): open the <strong>Go to…</strong> box to jump to an Incident, Field Report, or Visit by number</li>
+  <li><kbd><kbd>Ctrl</kbd> <kbd>Enter</kbd></kbd> (or <kbd><kbd>⌘</kbd> <kbd>Enter</kbd></kbd> on a Mac): submit the entry you're writing</li>
+  <li><kbd><kbd>Ctrl</kbd> <kbd>k</kbd></kbd> (or <kbd><kbd>⌘</kbd> <kbd>K</kbd></kbd> on a Mac): open the <strong>Go to…</strong> box to jump to an Incident, Field Report, or Visit by number</li>
 </ul>
 <p>
   If the single-key shortcuts get in your way (such as when using speech input), you can

web/template/help_modal.templ

@@ -48,5 +48,5 @@ templ helpShortcutsOffNote() {
 }
 
 templ helpGoToShortcut() {
-<li><kbd><kbd class="modifier-key">Ctrl</kbd> + <kbd>k</kbd></kbd>: go to a record by number, even while typing</li>
+<li><kbd><kbd class="modifier-key">Ctrl</kbd> <kbd>k</kbd></kbd>: go to a record by number, even while typing</li>
 }

web/template/incident.templ

@@ -353,7 +353,7 @@ templ Incident(deployment, versionName, versionRef, eventName string) {
                       class="btn btn-default btn-sm btn-block my-1 disabled no-print float-start"
                       onclick="submitReportEntry()"
               >
-                Add Entry <kbd><kbd class="modifier-key">Ctrl</kbd> + <kbd>Enter</kbd></kbd>
+                Add Entry <kbd><kbd class="modifier-key">Ctrl</kbd> <kbd>Enter</kbd></kbd>
               </button>
               <!-- File attachment -->
               <label class="input-group-text hidden" for="attach_file_input">Attach file</label>

web/template/root.templ

@@ -41,7 +41,7 @@ templ Root(deployment, versionName, versionRef string) {
 <div class="mt-3 if-logged-in hidden">
   <p>Here's what's new in IMS post-2026 event:</p>
   <ul>
-    <li>There's a new "go to" dialog for fast navigation. Head to any event-scoped page and bring up the dialog with <kbd><kbd>Ctrl K</kbd></kbd> (or <kbd><kbd>⌘ K</kbd></kbd> on a Mac).</li>
+    <li>There's a new "go to" dialog for fast navigation. Head to any event-scoped page and bring up the dialog with <kbd><kbd>Ctrl</kbd> <kbd>K</kbd></kbd> (or <kbd><kbd>⌘</kbd> <kbd>K</kbd></kbd> on a Mac).</li>
     <li>Attachments work better and their URLs are now stable.</li>
     <li>The <a href="/ims/app/search">Search Anywhere page</a> has seen subtle improvement.</li>
   </ul>

web/template/sanctuary_visit.templ

@@ -582,7 +582,7 @@ templ SanctuaryVisit(deployment, versionName, versionRef, eventName string) {
                       class="btn btn-default btn-sm btn-block my-1 disabled no-print float-start"
                       onclick="submitReportEntry()"
               >
-                Add Entry <kbd><kbd class="modifier-key">Ctrl</kbd> + <kbd>Enter</kbd></kbd>
+                Add Entry <kbd><kbd class="modifier-key">Ctrl</kbd> <kbd>Enter</kbd></kbd>
               </button>
               <!-- File attachment -->
               <label class="input-group-text hidden" for="attach_file_input">Attach file</label>