Skip to content

Commit

Permalink
Merge branch 'main' into feat/navbar-redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
Anjaliavv51 authored Oct 2, 2024
2 parents eff3339 + 63c1d7b commit d59ac26
Show file tree
Hide file tree
Showing 16 changed files with 477 additions and 90 deletions.
46 changes: 0 additions & 46 deletions .github/workflows/add-gssoc-label-pr.yml

This file was deleted.

1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"liveServer.settings.port": 5502
}
91 changes: 91 additions & 0 deletions Contributing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Contributing to Retro

We’re excited that you want to contribute to Retro! The following is a set of guidelines to help you contribute effectively and ensure consistency within the project.

## How to Contribute

### 1. Fork the Repository
Click on the "Fork" button at the top of the repository’s GitHub page. This will create a copy of the repository in your GitHub account.

### 2. Clone the Forked Repository
Clone the forked repository to your local machine using the command below:

```bash
git clone https://github.com/<your-github-username>/Retro
```

### 3. Add Remote Upstream
Add a remote upstream to keep your fork updated with the original repository:

```bash
git remote add upstream https://github.com/original-owner-username/Retro
```

### 4. Create a New Branch
Before making changes, create a new branch for your work:

```bash
git checkout -b <your-branch-name>
```

### 5. Make Your Changes
Make the necessary changes to the codebase.

### 6. Stage Your Changes
Once you’ve made your changes, stage them for commit:

```bash
git add <file1> <file2> ...
```

### 7. Commit Your Changes
Commit your changes with a descriptive message:

```bash
git commit -m "A meaningful message describing the change"
```

### 8. Push Your Changes
Push your changes to your forked repository:

```bash
git push origin <your-branch-name>
```

### 9. Create a Pull Request (PR)
Go to your forked repository on GitHub. You should see a prompt to create a pull request. Compare the changes and create the PR. Ensure to fill in details about the changes you’ve made.

---

## Guidelines

### Reporting Bugs
If you encounter any bugs, feel free to report them. Please ensure you include:
- A clear and descriptive title.
- A description of the issue and how to reproduce it.
- Expected behavior vs. actual behavior.
- Any error messages or logs that might help.

### Suggesting Features or Enhancements
We welcome new ideas and suggestions! To propose a new feature:
- Open an issue with a feature request label.
- Provide a clear description of the feature and how it improves the project.

### Submitting Code
- Keep your pull requests focused on a single change to make reviews easier.
- Follow the project’s code style.
- Ensure your code is properly tested before submitting.

### Commit Message Format
- Use meaningful and descriptive commit messages.
- Use the imperative mood (e.g., "Add feature" instead of "Added feature").

## Development Setup

To set up a local development environment:
1. Fork and clone the repository (as mentioned above).
2. Follow the installation steps in the README to get the project running locally.

---

Thank you for contributing to Retro! We appreciate your time and effort in helping us improve the project.
2 changes: 1 addition & 1 deletion Coverpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@
</div>
<center>
<button>
<span class="modernist"><a href="Home.html" style="cursor: pointer;text-decoration: none;text-decoration-color: black;" target="_parent">Explore</a></span>
<span class="modernist"><a href="index.html" style="cursor: pointer;text-decoration: none;text-decoration-color: black;" target="_parent">Explore</a></span>
<div class="icon-1">
<svg
xmlns:xlink="http://www.w3.org/1999/xlink"
Expand Down
65 changes: 62 additions & 3 deletions Css-files/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ body {
.navbarbg {
padding: 8px 0;
background-color: hsl(20, 43%, 93%);
text-align: center;
text-align: left;
}

.navbarbg ul {
Expand Down Expand Up @@ -383,9 +383,9 @@ div.deals:hover{
}

form {
padding-top: 20px;
/*padding-top: 20px;*/
display: grid;
padding-bottom: 100px;
/*padding-bottom: 100px;*/
}

label {
Expand Down Expand Up @@ -482,3 +482,62 @@ textarea {
.menu_items .items {
position: relative;
}


.form-control {
border-radius: 15px; /* Adjust the border radius */
padding-left: 40px; /* Space for the icon */
}

.input-icon {
position: relative;
}
.input-icon i {
position: absolute;
left: 10px; /* Positioning the icon */
top: 50%;
transform: translateY(-50%); /* Center the icon vertically */
color: gray; /* Icon color */
}
.input-icon input,
.input-icon textarea {
padding-left: 30px; /* Adjust padding to create space for the icon */
}

#contactForm {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 20rem;
height: max-content;
}

#contactForm input,
#contactForm textarea {
width: 100%;
padding: 20px;
margin: 5px;
border-radius: 10px;
border: none;
}

#contactForm h3 {
height: 30px;
color: #141414;
}
#contactForm textarea {
height: 100px;
resize: none;
}

#contactForm button {
padding: 10px 20px;
background-color:rgb(196, 74, 74);
color:rgb(15, 14, 14);
border: none;
border-radius: 5px;
cursor: pointer;
margin-top: 5px;
}

6 changes: 3 additions & 3 deletions Html-files/Electronic.html
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@
<header style="font-family: var(--ff-philosopher);">
<nav class="navbar">
<ul id="header-items" style="color: black;font-family: var(--ff-philosopher);justify-content: center;">
<li><a href="../Home.html" style="color: black;">&nbsp;&nbsp;&nbsp;&nbsp;
<li><a href="../index.html" style="color: black;">&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Home</a></li>
<li><a href="menu.html" style="color: black;">About</a></li>
<li><a href="services.html" style="color: black;">Services</a></li>
Expand Down Expand Up @@ -577,7 +577,7 @@ <h4>Telephone Operator</h4>
<div class="foot-panel2" style="font-family: Garamond;">
<ul class="footer-colums">
<p style="font-family: var(--ff-philosopher);color: black;">Our Pages</p>
<a href="../Home.html" style="text-decoration: none;font-family: var(--ff-poppins);color: white;">Home</a>
<a href="../index.html" style="text-decoration: none;font-family: var(--ff-poppins);color: white;">Home</a>
<a href="menu.html" style="text-decoration: none;font-family: var(--ff-poppins);color: white;">About</a>
<a href="services.html" style="text-decoration: none;font-family: var(--ff-poppins);color: white;">Services</a>
<a href="contact.html" style="text-decoration: none;font-family: var(--ff-poppins);color: white;">Contact</a>
Expand Down Expand Up @@ -622,7 +622,7 @@ <h4 style="font-family: var(--ff-philosopher);color: black;">Follow Us</h4>
<div class="social-icons">
<a class="fa-brands fa-facebook" href="https://facebook.com" target="_blank"></a>
<a class="fa-brands fa-instagram" href="https://instagram.com" target="_blank"></a>
<a class="fa-brands fa-twitter" href="https://twitter.com" target="_blank"></a>
<a class="fa-brands fa-x-twitter" href="https://twitter.com" target="_blank"></a>
</div>
</div>
<p style="margin-bottom:0;font-family: var(--ff-philosopher);color: white;">Stay connected with us on social media for the latest updates, latest collection, and vintage adventures.
Expand Down
8 changes: 3 additions & 5 deletions Html-files/cart.html
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<header>
<nav class="navbar">
<ul id="header-items">
<li><a href="../Home.html" style="color: black;font-family: var(--ff-philosopher);">Home</a></li>
<li><a href="../index.html" style="color: black;font-family: var(--ff-philosopher);">Home</a></li>
<li><a href="menu.html" style="color: black;font-family: var(--ff-philosopher);">About</a></li>
<li><a href="services.html" style="color: black;font-family: var(--ff-philosopher);">Services</a></li>
<li><a href="contact.html" style="color: black;font-family: var(--ff-philosopher);">Contact us</a></li>
Expand Down Expand Up @@ -251,7 +251,7 @@ <h1 style="color: black;font-family: var(--ff-philosopher);">C A R T</h1>
<div class="foot-panel2">
<ul class="footer-colums">
<p style="font-family: var(--ff-philosopher);">Our Pages</p>
<a href="../Home.html" style="text-decoration: none;color: black;font-family: var(--ff-poppins);">Home</a>
<a href="../index.html" style="text-decoration: none;color: black;font-family: var(--ff-poppins);">Home</a>
<a href="menu.html" style="text-decoration: none;color: black;font-family: var(--ff-poppins);">About</a>
<a href="services.html" style="text-decoration: none;color: black;font-family: var(--ff-poppins);">Services</a>
<a href="contact.html" style="text-decoration: none;color: black;font-family: var(--ff-poppins);">Contact us</a>
Expand Down Expand Up @@ -289,8 +289,6 @@ <h1 style="color: black;font-family: var(--ff-philosopher);">C A R T</h1>
<h3 style="font-family: var(--ff-philosopher);">Contact Us!</h3>
<input type="email" id="email" name="email" placeholder="Your Email" required="" style="font-family: var(--ff-poppins);">
<textarea id="message" name="message" placeholder="Your Message" required="" style="font-family: var(--ff-poppins);"></textarea>


<button id="butt" type="submit" style="font-family: var(--ff-poppins);">Send Message</button>
</form>
</div>
Expand All @@ -301,7 +299,7 @@ <h4 style="color: hsl(203, 30%,26%);font-family: var(--ff-philosopher);">Follow
<div class="social-icons">
<i class="fa-brands fa-facebook"></i>&nbsp;&nbsp;&nbsp;&nbsp;
<i class="fa-brands fa-instagram"></i>&nbsp;&nbsp;&nbsp;&nbsp;
<i class="fa-brands fa-twitter"></i>&nbsp;&nbsp;&nbsp;
<i class="fa-brands fa-x-twitter"></i>&nbsp;&nbsp;&nbsp;
</div>
<p style="margin-bottom:0;font-family: var(--ff-philosopher);">Stay connected with us on social media for the latest updates, latest collection, and vintage adventures.
</p>
Expand Down
Loading

0 comments on commit d59ac26

Please sign in to comment.