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.

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

Jump to bottom

Reintegrate navbar orientation for mobile #55

Merged
merged 5 commits into from
Sep 7, 2024
Merged

Reintegrate navbar orientation for mobile #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a962b77
Reintegrate navbar orientation for mobile
Apr 19, 2024
3ca0cc7
Add test code
Apr 25, 2024
c9e9c87
Merge branch 'feat/styling-refactor' of github.com:2308-Bread/bread-f…
dsstevens Apr 25, 2024
9818a2d
remove test
dsstevens Apr 25, 2024
702ece0
Fine-tune styling for cross-device consistency
Apr 30, 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
4 changes: 2 additions & 2 deletions src/components/Main/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import MapComponent from "../Map/Map";

const Main = () => {
return (
<div className="main h-screen w-screen overflow-hidden flex justify-center items-center">
<div className="main h-screen w-screen overflow-hidden flex justify-center items-center mt-[-4rem] lg:mt-[-1rem]">
<div className="map-wrapper flex flex-col h-[75%] w-full items-center">
<h2 className="font-fattest text-[#563c2c] hover:animate-wiggle focus:animate-wiggle drop-shadow-2xl text-center p-2 text-3xl md:text-3xl lg:text-4xl pt-0 md:pt-2 lg:pt-3">
<h2 className="font-fattest text-[#563c2c] hover:animate-wiggle focus:animate-wiggle drop-shadow-2xl text-center p-2 text-3xl md:text-4xl lg:text-5xl pt-0 md:pt-2 lg:pt-3">
Let's learn about bread - Select a region to get baking!
</h2>
<div className="map-background bg-[#e29c73] shadow-[0_.5rem_1.5rem_rgba(0,0,0,.75)] w-[95%] flex justify-center mt-6 md:mt-6 lg:mt-5 p-3 rounded-3xl lg:w-[60vw] xl:w-[50vw]">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Map/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useNavigate } from "react-router-dom";
const MapComponent = () => {
return (
<MapContainer
center={[0, 0]}
center={[15, -25]}
zoom={2}
style={{ height: "80vh", width: "100%" }}
maxBounds={[
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar/Navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

/* RESETTING THE NAV ORIENTATION */
@media screen and (min-width: 350px) {
@media screen and (min-width: 640px) {
.navbar {
@apply top-0 bottom-auto;
}
Expand Down
Loading