Skip to content

Commit

Permalink
Merge pull request #6618 from CitizenLabDotCo/task-fi-padding-on-folders
Browse files Browse the repository at this point in the history
Fix padding on folders page
  • Loading branch information
EdwinKato authored Dec 11, 2023
2 parents 132ffc1 + 7ad4964 commit 7b6b7bd
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions front/app/containers/Admin/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,13 @@ const AdminPage = memo<Props & WithRouterProps>(
if (!userCanViewPath) {
return null;
}
const isProjectPage = pathname.match(
/admin\/projects\/[a-f0-9-]+(\/[\w-]+)*/
const isFoldersPage = pathname.match(
/admin\/projects\/folders\/[a-f0-9-]+(\/(?!projects(?:\/|$))[\w-]+)*/
);
const isProjectPage =
pathname.match(
/admin\/projects\/[a-f0-9-]+(\/(?!projects(?:\/|$))[\w-]+)*/
) && !isFoldersPage;

const noPadding =
pathname.includes('admin/dashboard') ||
Expand Down

0 comments on commit 7b6b7bd

Please sign in to comment.