Skip to content

Fix/dom nesting bug #32

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.

Sign up for GitHub

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

Merged
rmnppt merged 2 commits into from
Apr 7, 2025
Merged

Fix/dom nesting bug #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b64109c
indentation
Apr 7, 2025
a822ae7
Remove <p> tags from modal description
Apr 7, 2025
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
21 changes: 10 additions & 11 deletions bs3/src/AppWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ export default function AppWrapper() {
boxShadow: 24
}}
>
<Typography id="modal-title" variant="h6" component="h2">
Welcome to the BS3 community.
</Typography>
<Typography id="modal-description" sx={{ mt: 2 }}>
<p>This app will ask to use your location data to confirm that you are in BS3.</p>
<p>It's optional but without it you will not be able to vote or post.</p>
<p>You are free to remain anonymous and your location data will never be stored.</p>
</Typography>
<Button onClick={onClose} sx={{ mt: 2 }}>
OK
</Button>
<Typography id="modal-title" variant="h6" component="h2">
Welcome to the BS3 community.
</Typography>
<Typography id="modal-description" sx={{ mt: 2 }}>
Location is optional but without it you will not be able to vote or post.
Location data will never be stored.
</Typography>
<Button onClick={onClose} sx={{ mt: 2 }}>
OK
</Button>
</Box>
</Modal>
);
Expand Down
4 changes: 3 additions & 1 deletion bs3/src/components/bottom-app-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ function HideOnScroll(props) {
</IconButton>
<Box sx={{ flexGrow: 1 }} />
<Box>
<Typography variant="caption" sx={{ marginBottom: 0, marginTop: 2 }}>User ID - {user}</Typography>
<Typography variant="caption" sx={{ marginBottom: 0, marginTop: 2 }}>
User ID - {user}
</Typography>
<br />
{ location.local ? (
<Box sx = {{ display: "flex", justifyContent: "flex-end" }}>
Expand Down