Skip to content

Commit

Permalink
fix (frontend): PWA map css height (#1528)
Browse files Browse the repository at this point in the history
* docs: update description for mkdocs site

* build(frontend): move dependencies to correct section (dev/prod)

* feat(frontend): add pwa config with all required icons (2023-minimal)

* build: add robots.txt for search engine web scraping

* fix(frontend): remove usage of material-icons imported css, use es6 imports

* fix(frontend): update how react app loads, including main.tsx

* docs: update docstrings around cookie auth

* fix(mainView): avoid showing header to only /project/ page

* fix(projectdetailsV2): add important to height class for map

---------

Co-authored-by: spwoodcock <[email protected]>
  • Loading branch information
NSUWAL123 and spwoodcock authored May 20, 2024
1 parent cbf008a commit d9660af
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/frontend/src/views/MainView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const MainView = () => {
<CoreModules.Paper>
<CoreModules.Container disableGutters={true} maxWidth={false}>
<CoreModules.Stack sx={{ height: '100vh' }}>
{popupInParams === 'true' || (location.pathname.includes('project') && windowSize.width <= 640) ? (
{popupInParams === 'true' || (location.pathname.includes('/project/') && windowSize.width <= 640) ? (
<div></div>
) : (
<div>
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/views/ProjectDetailsV2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ const Home = () => {
const [showDebugConsole, setShowDebugConsole] = useState(false);

return (
<div className="fmtm-bg-[#f5f5f5] fmtm-h-[100dvh] sm:fmtm-h-full">
<div className="fmtm-bg-[#f5f5f5] !fmtm-h-[100dvh] sm:!fmtm-h-full">
{/* only used to display debug console */}

<DebugConsole showDebugConsole={showDebugConsole} setShowDebugConsole={setShowDebugConsole} />
Expand Down Expand Up @@ -425,7 +425,7 @@ const Home = () => {
ref={mapRef}
mapInstance={map}
className={`map naxatw-relative naxatw-min-h-full naxatw-w-full ${
windowSize.width <= 640 ? 'fmtm-h-[100dvh]' : 'fmtm-h-full'
windowSize.width <= 640 ? '!fmtm-h-[100dvh]' : '!fmtm-h-full'
}`}
>
{import.meta.env.MODE === 'development' && (
Expand Down

0 comments on commit d9660af

Please sign in to comment.