Skip to content

armgit / bento

Public Imported from GitHub
0

Bento, the office suite that fits in a file

Resolve the replay onto main, and re-ignore the tray build artifacts

nyblnet8a7c76fce299
diff --git a/.gitignore b/.gitignore
index d7194101..c5a41fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,9 @@ working/
# make-og.mjs intermediate (the SVG rasterised into site-src/og.png)
scripts/.cache/
+
+# tray: generated by xcodegen and by the slides build. The paths moved when
+# tray/BentoTray/ was renamed to tray/ios/, which silently unignored them and
+# let a broad `git add` sweep them into an unrelated PR.
+tray/ios/*.xcodeproj/
+tray/ios/Resources/starter.bento.html
diff --git a/slides/src/styles.css b/slides/src/styles.css
index 675f9112..edca47c1 100644
--- a/slides/src/styles.css
+++ b/slides/src/styles.css
@@ -1605,19 +1605,11 @@ body.ed-col-resizing { cursor: col-resize; user-select: none; }
/* bottom-end cluster: [Slideshow pill] [zoom pill] */
.ed-corner-br {
position: absolute;
-<<<<<<< HEAD
- inset-inline-end: 14px;
- bottom: 14px;
-=======
- /* the present/zoom cluster sits in the corner most likely to be clipped */
-<<<<<<< HEAD
- right: max(14px, env(safe-area-inset-right));
- bottom: max(14px, env(safe-area-inset-bottom));
->>>>>>> 647c467 (Editor: keep chrome clear of rounded corners and the Dynamic Island)
-=======
- right: max(14px, env(safe-area-inset-right), var(--tray-safe-right, 0px));
+ /* the present/zoom cluster sits in the corner most likely to be clipped.
+ Kept LOGICAL (inset-inline-end, not right) so the cluster still lands in
+ the correct corner under RTL — ar/fa/he/ur ship as language packs. */
+ inset-inline-end: max(14px, env(safe-area-inset-right), var(--tray-safe-right, 0px));
bottom: max(14px, env(safe-area-inset-bottom), var(--tray-safe-bottom, 0px));
->>>>>>> 43ad9b7 (Editor: accept host-published safe-area insets as a fallback)
display: flex;
align-items: center;
gap: 10px;