Resolved merge conflict in Contactus.html

arpithasm88 · Nov 10, 2024 · 7699d7f · 7699d7f
2 parents a756823 + 41247c2
commit 7699d7f
Show file tree

Hide file tree

Showing 39 changed files with 3,015 additions and 761 deletions.
diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
@@ -0,0 +1,39 @@
+name: Auto Label Issue/PR
+
+on:
+  issues:
+    types: [opened, reopened, edited]
+  pull_request:
+    types: [opened, reopened, edited]
+
+jobs:
+  label_issue_pr:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Label Issue/PR
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const isIssue = context.payload.issue !== undefined;
+            const item = isIssue ? context.payload.issue : context.payload.pull_request;
+            const itemBody = item.body ? item.body.toLowerCase() : '';
+            const itemTitle = item.title.toLowerCase();
+            // Add labels to both issues and pull requests
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: item.number,
+              labels: ['gssoc-ext', 'hacktoberfest-accepted']
+            });
+            const addLabel = async (label) => {
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: item.number,
+                labels: [label]
+              });
+            };
diff --git a/Backend/package-lock.json b/Backend/package-lock.json
diff --git a/Contactus.html b/Contactus.html
@@ -206,10 +206,88 @@
         /* Prevent text from wrapping */
       }
 
+<<<<<<< HEAD
       .chatbot-button:hover .tooltip-text {
         display: block;
         /* Show on hover */
       }
+=======
+    .chatbot-button {
+      background-color: #007bff;
+      border: none;
+      border-radius: 50%;
+      padding: 10px;
+      /* Smaller padding */
+      cursor: pointer;
+      position: relative;
+      width: 50px;
+      /* Adjusted size */
+      height: 50px;
+      /* Adjusted size */
+      right: -60px;
+    }
+
+    .chatbot-button img {
+      width: 30px;
+      /* Adjusted image size */
+      height: 30px;
+      /* Adjusted image size */
+    }
+
+    .tooltip-text {
+      display: none;
+      /* Hide by default */
+      position: absolute;
+      bottom: 100%;
+      /* Position above the button */
+      right: 50%;
+      transform: translateX(50%);
+      background-color: #333;
+      /* Background color for tooltip */
+      color: #fff;
+      /* Tooltip text color */
+      padding: 5px;
+      border-radius: 5px;
+      white-space: nowrap;
+      /* Prevent text from wrapping */
+    }
+
+    .chatbot-button:hover .tooltip-text {
+      display: block;
+      /* Show on hover */
+    }
+
+    /* Navbar Styles */
+    .menu {
+      display: flex;
+      justify-content: center;
+      margin: 20px 0;
+    }
+
+    .nav-links {
+      list-style: none;
+      display: flex;
+      padding: 10px;
+      background-color: #f0f0f0; /* Light background color */
+      border-radius: 25px; /* Rounded corners */
+      box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1); /* Subtle shadow */
+    }
+
+    .nav-links li {
+      margin: 0 15px; /* Space between links */
+    }
+
+    .nav-links a {
+      text-decoration: none;
+      color: #333; /* Dark text color */
+      font-weight: 500; /* Medium font weight */
+      transition: color 0.3s; /* Smooth color transition */
+    }
+
+    .nav-links a:hover {
+      color: #007bff; /* Change color on hover */
+    }
+>>>>>>> 41247c22d8e66ceeaf199efc11d51ee41afd30ab
     </style>
   </head>
   <body>
@@ -233,13 +311,36 @@
         </div>
 
         <nav class="menu">
+<<<<<<< HEAD
           <ul>
                 <li><a href="index.html" id="home-link" onclick="changeContent('home')"><i class="fa-solid fa-house"></i> Home</a></li>
                 <li><a href="features.html" id="features-link" onclick="changeContent('features')"><i class="fa-solid fa-file"></i> Features</a></li>
                 <li><a href="team.html" id="team-link" onclick="changeContent('team')"><i class="fa-solid fa-user-group"></i> Team</a></li>
                 <li><a href="contact.html" id="contact-link" onclick="changeContent('contact')"><i class="fa-solid fa-phone"></i> Contact</a></li>
                 <li><a href="Feedback.html" id="feedback-link" onclick="changeContent('feedback')"><i class="fa-solid fa-clipboard"></i> Feedback</a></li>
           </ul>
+=======
+            <ul class="nav-links">
+                <li>
+                    <a href="./index.html" id="home-link" onclick="changeContent('home')">Home</a>
+                </li>
+                <li>
+                    <a href="features.html" id="features-link" onclick="changeContent('features')">Features</a>
+                </li>
+                <li>
+                    <a href="team.html" id="team-link" onclick="changeContent('team')">Team</a>
+                </li>
+                <li>
+                    <a href="contact.html" id="contact-link" onclick="changeContent('contact')">Contact</a>
+                </li>
+                <li>
+                    <a href="Feedback.html" id="feedback-link" onclick="changeContent('feedback')">Feedback</a>
+                </li>
+                <li>
+                    <a href="nearby.html" id="nearby-link" onclick="changeContent('nearby')">Nearby</a>
+                </li>
+            </ul>
+>>>>>>> 41247c22d8e66ceeaf199efc11d51ee41afd30ab
         </nav>
         <div class="buttons">
           <a href="login.html" class="login">Log in</a>