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

Fix issue 72 #143

Merged
merged 3 commits into from
May 15, 2024
Merged

Fix issue 72 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a94d623
rectified all the css error except about page
MAVRICK-1 May 14, 2024
4970091
Updated Footer
jinx-vi-0 May 15, 2024
d0fd9e6
Merge branch 'dev' into fix-issue-72
jinx-vi-0 May 15, 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/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import Listing from "./pages/Listing";
import NotFound from "./pages/NotFound";
import SignIn from "./pages/SignIn";
import SignUp from "./pages/SignUp";

import ResetPassword from "./pages/ResetPassword";
import Cart from "./pages/cart";
import Wishlist from "./pages/wishList";
import "./responsive.css";


// import data from './data';
import { collection, doc, getDocs } from "firebase/firestore";
import MapComponent from "./components/map/ITEMmap";
Expand Down
17 changes: 2 additions & 15 deletions src/components/footer/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,6 @@ const Footer = () => {
</ul>
</div>

<div className='col'>
<h3>Company</h3>
<ul className="footer-list mb-sm-5 mb-md-0">
<li><Link to="#">Account</Link></li>
<li><Link to="#">Delivery Information</Link></li>
<li><Link to="#">Privacy Policy</Link></li>
<li><Link to="#">Terms &amp; Conditions</Link></li>
<li><Link to="#">Contact Us</Link></li>
<li><Link to="#">Support Center</Link></li>
<li><Link to="#">Careers</Link></li>
</ul>
</div>


<div className='col'>
<h3>Corporate</h3>
Expand Down Expand Up @@ -207,8 +194,8 @@ const Footer = () => {

<div className='row lastStrip'>
<div className='col-md-3 part_1'>
<p>© {currentYear}, Nest - HTML Ecommerce Template
All rights reserved</p>
<p>© {currentYear}, Nest - HTML Ecommerce Template</p>
<p>All rights reserved</p>
</div>

<div className='col-md-6 d-flex part_2'>
Expand Down