Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Issue #6966 [Status bar overlap on iPads using Tailwind CSS] #7310

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
95e0988
IOS Header overlap with UI resloved with tailwind CSS component in Ap…
Xeno-Tek Oct 11, 2024
993afc2
Fix header overlap with UI on iOS devices.
Xeno-Tek Oct 11, 2024
1015efc
Updated the map to extend into safe area insets space, moved the zoom…
Xeno-Tek Oct 14, 2024
87c0ebd
tailwind.config.cjs: Removed redundant iOS Code for iPad.
Xeno-Tek Oct 14, 2024
0868847
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 14, 2024
52672f1
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 14, 2024
d3dff36
Add CapacitorShare pod dependency
Xeno-Tek Oct 14, 2024
5af2289
Reverted Podfile.lock
Xeno-Tek Oct 14, 2024
0c4040c
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 14, 2024
c14b602
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 14, 2024
907fb16
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 14, 2024
5c9e44e
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 14, 2024
63a1a3b
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 16, 2024
0811d55
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 16, 2024
698053e
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 16, 2024
46970e8
index.css: Applied root and utlities from main.tsx to index.css.
Xeno-Tek Oct 16, 2024
4c36612
Deleted mockserver/package-lock.json
Xeno-Tek Oct 16, 2024
10ff2e7
ZoomControls.tsx: Removed unused imports.
Xeno-Tek Oct 16, 2024
341b05e
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 17, 2024
51cc915
Merge branch 'master' into issue-#6966-Branch
Xeno-Tek Oct 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions web/src/features/map-controls/ZoomControls.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { useFeatureFlag } from 'features/feature-flags/api';
import { ReactElement } from 'react';
import { NavigationControl } from 'react-map-gl/maplibre';

export default function ZoomControls(): ReactElement {
const isConsumptionOnlyMode = useFeatureFlag('consumption-only');
const marginTop = isConsumptionOnlyMode ? 54 : 98;
return (
<NavigationControl
style={{
marginRight: 12,
marginTop: marginTop,
marginTop: 'calc(98px + var(--sat, 0px))',
width: '33px',
boxShadow: '0px 1px 1px rgb(0 0 0 / 0.1)',
border: 0,
Expand Down
8 changes: 7 additions & 1 deletion web/src/features/map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,13 @@ export default function MapPage({ onMapLoad }: MapPageProps): ReactElement {
[Number.NEGATIVE_INFINITY, SOUTHERN_LATITUDE_BOUND],
[Number.POSITIVE_INFINITY, NORTHERN_LATITUDE_BOUND],
]}
style={{ minWidth: '100vw', height: '100vh', position: 'absolute' }}
style={{
minWidth: '100vw',
height: '100vh',
position: 'absolute',
inset: 0,
marginTop: 'calc(var(--sat) * -1)',
}}
mapStyle={MAP_STYLE as StyleSpecification}
>
<BackgroundLayer />
Expand Down
21 changes: 21 additions & 0 deletions web/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
/* Disables mobile touch specific blue user select effect */
-webkit-tap-highlight-color: transparent;
}

#root {
@apply pt-[var(--sat)];
}

h1 {
@apply text-xl;
@apply font-poppins;
Expand All @@ -50,6 +55,22 @@
@apply font-inter;
}
}

@layer utilities {
.extend-to-top-edge {
@apply absolute left-0 right-0 top-0 h-full;
margin-top: calc(var(--sat) * -1);
}

.content-within-safe-area {
@apply relative z-[1] p-[var(--sar)_var(--sab)_var(--sal)];
}

.pad-for-header {
@apply pt-[var(--sat)];
}
}

*::-webkit-scrollbar {
/*remove scrollbar track chrome*/
background-color: transparent;
Expand Down