Skip to content

Overlapping Issue Resolved #93

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Overlapping Issue Resolved #93

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
01782f3
Overlapping Issue Resolved
Vanshika7902 May 12, 2024
91c066d
Merge branch 'main' into overlapping
Vanshika7902 May 12, 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
2 changes: 1 addition & 1 deletion src/Components/CartItems.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const CartItems = () => {
const { getCartTotalAmount, all_products, cartItem, RemoveFromCart } =
useContext(ShopContext);
return (
<div className="w-full h-screen my-5">
<div className="w-full h-max my-5">
<div className="grid grid-cols-7 gap-5 items-center ml-14">
<p className=" font-bold">Products</p>
<p className="font-bold">Title</p>
Expand Down
10 changes: 5 additions & 5 deletions src/Components/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import whatsappIcon from "../assets/whatsapp_icon.png";

const Footer = () => {
return (
<>
<div className="bg-gradient-to-b from-purple-100 to-white py-12 flex items-center justify-between">
<div className="">
<h2 className="text-4xl font-bold text-orange-400 ml-5">Shopy</h2>
<p className="text-gray-400 ml-5">Connecting people through fashion.</p>
<footer className="bg-gradient-to-t from-purple-100 to-white text-black py-10 relative">
<div className="container mx-auto flex flex-col md:flex-row items-center justify-between absolute bottom-0">
<div className="mb-4 md:mb-0">
<h2 className="text-2xl font-bold text-orange-400">Shopy</h2>
<p className="text-gray-400">Connecting people through fashion.</p>
</div>

<div className="max-w-2xl text-center mb-3">
Expand Down