Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Vikashchou-dhary authored Jul 1, 2024
2 parents 04fb5af + 25d7f6a commit ce423b3
Show file tree
Hide file tree
Showing 93 changed files with 4,071 additions and 4,569 deletions.
35 changes: 35 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,41 @@ To get started with Food ordering website, follow these simple steps:
```
5. Create a Pull Request:
Navigate back to the original repository and open a pull request from your forked repository.
### Alternatively, contribute using GitHub Desktop
1. **Open GitHub Desktop:**
Launch GitHub Desktop and log in to your GitHub account if you haven't already.

2. **Clone the Repository:**
- If you haven't cloned the Food-ordering-website repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
- Choose the Food-ordering-website repository from the list of repositories on GitHub and clone it to your local machine.
3. **Switch to the Correct Branch:**
- Ensure you are on the branch that you want to submit a pull request for.
- If you need to switch branches, you can do so by clicking on the "Current Branch" dropdown menu and selecting the desired branch.
4. **Make Changes:**
Make your changes to the code or files in the repository using your preferred code editor.
5. **Commit Changes:**
- In GitHub Desktop, you'll see a list of the files you've changed. Check the box next to each file you want to include in the commit.
- Enter a summary and description for your changes in the "Summary" and "Description" fields, respectively. Click the "Commit to <branch-name>" button to commit your changes to the local branch.
6. **Push Changes to GitHub:**
After committing your changes, click the "Push origin" button in the top right corner of GitHub Desktop to push your changes to your forked repository on GitHub.
7. **Create a Pull Request:**
- Go to the GitHub website and navigate to your fork of the Food-ordering-website repository.
- You should see a button to "Compare & pull request" between your fork and the original repository. Click on it.
8. **Review and Submit:**
- On the pull request page, review your changes and add any additional information, such as a title and description, that you want to include with your pull request.
- Once you're satisfied, click the "Create pull request" button to submit your pull request.

9. **Wait for Review:**
Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the Food-ordering-website repository.

## **Pull Request Process 🚀**
1. Ensure that you have self reviewed your code 😀
2. Make sure you have added the proper description for the functionality of the code
Expand Down
24 changes: 24 additions & 0 deletions Css-files/book-table.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.mainhead::before {
content: "";
width: 100%;
height: 100%;
top: 0;
left: 0;
background-image: url(https://cdn.tasteatlas.com//images/toplistarticles/d0e6a0a79d5f4197a51f4ca065393ffe.jpg?mw=1300);
background-size: cover;
opacity: 0.4;
z-index: -1;
}

.mainhead {
text-align: center;
padding-top: 30px;
}

.mainhead h1 {
font-family: "Bree Serif", serif;
font-size: 3.8rem;
color: white;
font-weight: 700;
letter-spacing: 5px;
}
24 changes: 23 additions & 1 deletion Css-files/cart.css
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ textarea {
height: 40px;
background-color: brown;
color: aliceblue;
z-index: 2000;
z-index: 20;
}
@media all and (max-width: 768px) {
.cart {
Expand Down Expand Up @@ -197,3 +197,25 @@ background-size: 100% 100%;}
font-size: 28px;
font-weight: bold;
}

::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.6);
background-image: linear-gradient(to top, rgb(246, 10, 10) , rgb(248, 145, 49), rgb(236, 239, 56));
}

::-webkit-scrollbar {
width:12px;

}

::-webkit-scrollbar-thumb {
background-color: #ff0707;
border-radius: 10px;
border:.3px solid white;
background-image: -webkit-linear-gradient(90deg,
rgb(20, 21, 12) 0%,
rgb(0, 0, 0) 25%,
transparent 100%,
rgb(247, 4, 4) 75%,
transparent)
}
21 changes: 21 additions & 0 deletions Css-files/cateringservices.css
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,24 @@ textarea {
#butt:hover {
background-color: rgb(196, 89, 89);
}
::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.6);
background-image: linear-gradient(to top, rgb(246, 10, 10) , rgb(248, 145, 49), rgb(236, 239, 56));
}

::-webkit-scrollbar {
width:12px;

}

::-webkit-scrollbar-thumb {
background-color: #ff0707;
border-radius: 10px;
border:.3px solid white;
background-image: -webkit-linear-gradient(90deg,
rgb(20, 21, 12) 0%,
rgb(0, 0, 0) 25%,
transparent 100%,
rgb(247, 4, 4) 75%,
transparent)
}
Binary file removed Css-files/contact_page_background_image.png
Binary file not shown.
Loading

0 comments on commit ce423b3

Please sign in to comment.