From 20fea517cecefc236f88bc4e7e77bccca88c9ce6 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 14 Feb 2025 08:46:13 +0530 Subject: [PATCH] Revert "Workbench" This reverts commit 4736ec7e0a01a5bb045b9f1e0e5c571db78c0e6a. --- web/apps/photos/src/pages/_app.tsx | 4 ++-- web/apps/photos/src/styles/global.css | 3 +-- web/packages/new/photos/components/FileViewerPhotoSwipe.tsx | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index 62800fc6fe..98bbec1235 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -50,9 +50,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/new/photos/components/ps5/dist/photoswipe.css"; +// import "../../../../packages/new/photos/components/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 index 60f4b22151..1abd2df3c4 100644 --- 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; } -} /* Make the controllable video elements we render as custom PhotoSwipe content diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx index 22b37ca2fd..db1771f379 100644 --- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx +++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx @@ -28,7 +28,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; } // TODO(PS): //import { type SlideData } from "./ps5/dist/types/slide/"