Solved merge conflicts

.github/workflows/autocomment-issue.yml

@@ -17,7 +17,7 @@ jobs:
         run: |
           COMMENT=$(cat <<EOF
           {
-            "body": "Thank you for creating this issue! 🎉 We'll look into it as soon as possible. In the meantime, please make sure to provide all the necessary details and context. If you have any questions or additional information, feel free to add them here. Your contributions are highly appreciated! 😊\n\nYou can also check our [CONTRIBUTING.md](https://github.com/anuragverma108/SwapReads/blob/main/CONTRIBUTING.md) for guidelines on contributing to this project."
+            "body": "Thank you for creating this issue! 🎉 Your issue will soon be reviewed by either the PA or a mentor. Please await their response. In the meantime, please make sure to provide all the necessary details and context. If you have any questions or additional information, feel free to add them here. Your contributions are highly appreciated! 😊\n\nYou can also check our [CONTRIBUTING.md](https://github.com/anuragverma108/SwapReads/blob/main/CONTRIBUTING.md) for guidelines on contributing to this project."
           }
           EOF
           )

.github/workflows/autocomment-wait.yml

@@ -17,7 +17,7 @@ jobs:
         run: |
           COMMENT=$(cat <<EOF
           {
-            "body": "Your issue will be reviewed shortly by the PA or a mentor. Please wait for their response."
+            "body": "**Important Note:**\nThis repository serves as a gateway for newcomers to explore open-source projects. To ensure fairness in learning, we're introducing a cap on the points awarded to individual contributors. Going forward, each contributor will be restricted to earning a maximum of 150 points. This limitation specifically applies to the GSSOC project.\n Thank you for your understanding and cooperation in maintaining an inclusive learning environment."
           }
           EOF
           )

assets/css/aboutus.css

@@ -72,6 +72,10 @@ h1, h2, h3 {
   gap: 20px;
 }
 
+.team h2{
+  color: var(--sonic-silver);
+}
+
 .team-member {
   color:var(--sonic-silver);
   text-align: center;
@@ -207,3 +211,10 @@ h1, h2, h3 {
   }
 }
 
+h2.links{
+  color: var(--charcoal);
+}
+
+label.newsletter-form{
+  color: var(--charcoal);
+}

assets/css/forgot-pass.css

@@ -49,12 +49,11 @@ body {
     margin-top:200px;
     margin-bottom: 50px;
     display: flex;
-    margin-top:120px;
     margin-left: 50px;
     margin-bottom: 40px;
     align-items: center;
   }
-@media (max-width: 600px) {
+@media (max-width: 992px) {
   .bookworms {
       display: flex;
       flex-direction: column;

assets/css/login.css

@@ -59,6 +59,11 @@ p {
   width: 100%;
   background-color: #f5ebe6;
 }
+
+.navbar-link {
+  text-decoration: none;
+}
+
 .navbar-header {
   width: 100%;
   font-family: var(--ff-poppins);
@@ -72,7 +77,9 @@ p {
   color: rgb(247, 150, 150);
   font-size: 2rem;
   margin-left: 2rem;
+  text-decoration: none;
 }
+
 .pass-container{
   position: relative;
 }
@@ -566,6 +573,10 @@ input[type="password"]::-ms-reveal {
     background-color: #02b502;
 }
 
+.dark-mode .list-unstyled li {
+  color: white;
+}
+
 .list-unstyled li{
 	font-size: 18px;
 }
@@ -1180,3 +1191,27 @@ input[type="submit"]:hover {
   font-size:1.1em;
   background-color: transparent;
 }
+.subscribe-section {
+  border: 1px solid #000; /* lean border */
+  padding: 10px;
+  display: inline-block;
+}
+.subscribe-label {
+  color:grey;
+  margin-bottom: 10px;
+  text-align: center; /* center the text */
+  width: 100%; 
+  display: inline-block;
+  font-weight: bold;
+  font-family: var(--ff-philosopher)
+}
+.alternate-color {
+  color: blue; /* alternate text color */
+}
+.row-flex {
+  display: flex;
+  align-items: center;
+}
+.subscribe-btn {
+  margin-left: 10px;
+}

assets/css/style.css

@@ -337,7 +337,7 @@ body {
 
 .section {
   padding-block: var(--section-padding);
-
+  padding-top: 150px;
 }
 
 .section-subtitle {
@@ -348,6 +348,7 @@ body {
   margin-bottom: 20px;
   font-size: 2.5rem;
   text-align: center;
+  padding-top: 30px;
 }
 
 .h1,
@@ -528,8 +529,8 @@ body {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: 80px;
-  /* width:200px; */
+  height: 90px;
+
 }
 
 .logo {
@@ -1015,8 +1016,24 @@ body {
 
 .benefits-card:is(:hover, :focus-within) {
   transform: translateY(-10px);
+  background-color: #FFB6B9; /* Change to desired hover color */
+}
+
+.benefits-card:hover, .benefits-card:focus-within {
+  background-color: #FFB6B9; /* Change to desired hover color */
+  color: black;
+}
+
+.benefits-card:hover .card-title,
+.benefits-card:hover .card-text,
+.benefits-card:hover .btn-link,
+.benefits-card:focus-within .card-title,
+.benefits-card:focus-within .card-text,
+.benefits-card:focus-within .btn-link {
+  color: black; /* Change text color to black on hover */
 }
 
+
 .benefits-card:is(:hover, :focus-within)::before,
 .benefits-card:is(:hover, :focus-within)::after {
   transform: translateY(0);
@@ -1453,7 +1470,7 @@ textarea.input-field {
 }
 
 .subscribe-btn{
-  background-color: var(--old-rose);
+  background-color: var(--old-rose) !important;
   color: var(--white);
   height: 4rem;
   padding: 2px 20px;
@@ -1571,7 +1588,12 @@ textarea.input-field {
   /* To remove the default underline */
 }
 
+.home_button:hover {
+  text-decoration: none;
+}
+
 .home_button::before {
+  text-decoration: none;
   content: "\f00d";
   font-size: 2.5rem;
   font-weight: 800;
@@ -1679,7 +1701,7 @@ footer {
 }
 
 .foot-quick :hover {
-  color: rgb(201, 168, 168);
+  color: red;
 }
 
 .foot-middle ul {
@@ -1785,7 +1807,7 @@ input:focus {
   outline: 0;
 }
 
-input[type="news"] {
+input[type="email"] {
   width: 100%;
   /* Adjusted width */
   max-width: 300px;
@@ -1804,7 +1826,7 @@ input[type="news"] {
   text-transform: uppercase;
 }
 
-input[type="news"]:focus {
+input[type="email"]:focus {
   border: 2px solid #c27a7e;
 }
 
@@ -1995,6 +2017,7 @@ input[type="submit"]:hover {
     padding-bottom: 1rem;
     padding-top: 1rem;
     padding-left: 0 !important;
+    height:300px;
   }
 
   html {
@@ -2540,6 +2563,7 @@ input[type="submit"]:hover {
   transition: all 0.3s ease;
   padding-left: 4px;
   padding-right: 4px;
+  text-decoration: none;
 }
 
 /* .navbar-link:hover {
@@ -2569,10 +2593,12 @@ input[type="submit"]:hover {
   height: 3px;
   box-shadow: 0 0 10px #f39d127e;
   transition: all 0.6s;
+  text-decoration: none;
 }
 
 .navbar-link:hover::after {
   width: 100%;
+  text-decoration: none;
 }
 
 /* Faq Section */
@@ -2695,6 +2721,12 @@ body.dark-mode {
 * Dark Mode
 */
 
+/* Dark Mode Switch */
+.dark-mode .switch-container {
+  right: 14px;
+  top: 5px;
+}
+
 .dark-mode {
   --sonic-silver: #fff;
   --ghost-white: #1e1c1c;
@@ -2719,6 +2751,7 @@ body.dark-mode {
 body.dark-mode .navbar-link:hover,
 body.dark-mode .navbar-link.active {
   color:var(--old-rose);
+  text-decoration: none;
 }
 
 body.dark-mode .navbar-link::after {
@@ -2802,6 +2835,11 @@ footer {
   top: 15px;
 }
 
+.light-mode .switch-container {
+  right: 14px;
+  top: 5px;
+}
+
 /* Hidden Checkbox */
 .switch-checkbox {
   display: none;
@@ -2888,13 +2926,10 @@ footer {
 
 }
 
-@media (min-width: 481px) {
+@media (min-width: 881px) {
   .navbar-list {
     flex-direction: column;
   }
-  .switch-container{
-    transform: translateY(-20px);
-  }
 }
 
 @media (min-width: 641px) {
@@ -2934,7 +2969,7 @@ footer {
 
 
 .subscribe-btn {
-  background-color: red;
+  background-color: (--chinese-violet);
   color: var(--white);
   width: 20rem;
 }
@@ -2945,6 +2980,14 @@ footer {
   border: #d26d6d 2px solid;
 }
 
+.row-copy{
+  display: flex;
+  flex-direction: row;
+  text-align: center;
+  justify-content: center;
+  gap: 10px;
+}
+
 /* Medium devices (large tablets and small laptops, 768px to 1060px) */
 @media (min-width: 768px) and (max-width: 1060px) {
   .foot-top {
@@ -3073,7 +3116,7 @@ select {
 .container00 h2 {
   color: rgb(62, 60, 60);
   margin-bottom: 50px;
-  margin-left: 280px;
+  margin-left: 230px;
   font-size: 30px;
 }
 
@@ -3224,7 +3267,7 @@ body.dark-mode .h3 {
   color: #ffffff;
 }
 
-.recommendationTitle-heading {
+.container01 h1 {
   color: white;
 }
 
@@ -3456,10 +3499,10 @@ body.dark-mode .h3 {
 
 /* Adding media queries for benifits */
 
-@media screen and(min-width: ) {
+/* @media screen and(min-width: ) {
   .benefits .grid-list
   {
 
   }
   
-}
+} */