Skip to content

feat: conflict solved #57

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

feat: conflict solved #57

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
36958b8
feat: conflict solved
yesimsit Aug 23, 2022
d3472f7
Merge branch 'main' into i55-landing_meals_final
yesimsit Aug 24, 2022
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
3 changes: 1 addition & 2 deletions src/components/Cards/Cards.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const Cards = () => {
width={50}
/>
</div>
<div className='text-xl font-semibold text-black sm:text-2xl lg:text-3xl'>
<div className='text-xl font-semibold text-black sm:text-2xl lg:text-3xl'>
{" "}
Pick your chef order the food and get it when
you want
Expand All @@ -49,7 +49,6 @@ const Cards = () => {
/>
</div>
</div>

<div className='flex h-[350px] w-[660px] flex-row rounded-[10px] bg-[#FFE7E3] shadow-lg '>
<div className='flex basis-2/3 flex-col justify-center gap-4 px-6 pt-12 '>
<p className='text-xl font-semibold text-black sm:text-2xl lg:text-3xl'>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Cards/__test__/__snapshots__/Cards.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ exports[`renders correctly 1`] = `
className="flex basis-2/3 flex-col justify-center gap-4 px-6 pt-12 "
>
<p
className="text-xl font-semibold text-black sm:text-2xl lg:text-3xl"
className="text-xl font-semibold text-black sm:text-2xl lg:text-3xl
>
Get a 15% discount for your first order!
</p>
Expand Down
1 change: 1 addition & 0 deletions src/components/Navbar/__snapshots__/Navbar.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ exports[`Navbar Component 1`] = `
href="/#"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
<span
className="font-black"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function HomePage() {
export async function getStaticProps({ locale }) {
return {
props: {
...(await serverSideTranslations(locale, ["common"])),
...(await serverSideTranslations(locale, ["common", "navbar"])),
// Will be passed to the page component as props
},
};
Expand Down