Mainlineable

ente-io · Feb 17, 2025 · 6ccca21 · 6ccca21
1 parent 0e3708f
commit 6ccca21
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
@@ -51,9 +51,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -23,7 +23,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 type FileViewerPhotoSwipeOptions = FileViewerProps & {