diff --git a/.gitignore b/.gitignore index 4d29575..3c3629e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* +node_modules diff --git a/src/About.js b/src/About.js index 6262d7a..926f27c 100644 --- a/src/About.js +++ b/src/About.js @@ -5,12 +5,21 @@ const About = () => {

About Us

+<<<<<<< HEAD

At our core, we're passionate about crafting unforgettable culinary experiences. With a commitment to quality ingredients and creative flair, we strive to delight taste buds and create lasting memories. Our journey began with a vision to redefine traditional flavors and elevate dining experiences. Guided by innovation and a dedication to excellence, we aim to be your go-to destination for gastronomic adventures. Welcome to a world where every dish tells a story, and every bite is an invitation to savor the extraordinary.

+======= +
+
+

+At our core, we're passionate about crafting unforgettable culinary experiences. With a commitment to quality ingredients and creative flair, we strive to delight taste buds and create lasting memories. Our journey began with a vision to redefine traditional flavors and elevate dining experiences. Guided by innovation and a dedication to excellence, we aim to be your go-to destination for gastronomic adventures. Welcome to a world where every dish tells a story, and every bite is an invitation to savor the extraordinary.

+
+
+>>>>>>> refs/remotes/origin/main about
@@ -34,4 +43,4 @@ At our core, we're passionate about crafting unforgettable culinary experiences. ) } -export default About \ No newline at end of file +export default About diff --git a/src/Booknow.css b/src/Booknow.css index b4e9647..cb1f51f 100644 --- a/src/Booknow.css +++ b/src/Booknow.css @@ -1,9 +1,13 @@ .golden_chief{ display: flex; +<<<<<<< HEAD padding-top: 6rem; +======= +>>>>>>> refs/remotes/origin/main flex-direction: column; justify-content: center; align-items: center; + padding-top:6rem; width: 100%; } .golden_chief div{ @@ -17,7 +21,11 @@ .golden_chief div #content{ display: flex; max-width: 90%; +<<<<<<< HEAD flex: 1 0 20rem; +======= + flex: 1 0 10rem; +>>>>>>> refs/remotes/origin/main flex-direction: column; justify-content: center; align-items: center; @@ -28,7 +36,11 @@ font-size: 1.2rem; } .golden_chief div #image{ +<<<<<<< HEAD flex: 1 0 20rem; +======= + flex: 1 0 10rem; +>>>>>>> refs/remotes/origin/main display: flex; justify-content: center; align-items: center;