Merge branch 'main' into index31

revolution-software-club · Feb 16, 2024 · cf49d48 · cf49d48
2 parents 2d38d71 + 736b5a6
commit cf49d48
Show file tree

Hide file tree

Showing 28 changed files with 2,182 additions and 555 deletions.
diff --git a/Images/Aakanksha_Darekar.jpg b/Images/Aakanksha_Darekar.jpg
diff --git a/Images/Atharva_Daga.jpg b/Images/Atharva_Daga.jpg
diff --git a/Images/Deven_Patil.jpg b/Images/Deven_Patil.jpg
diff --git a/Images/Nidhi_Nair.jpg b/Images/Nidhi_Nair.jpg
diff --git a/Images/Rohit_Deshmukh.jpg b/Images/Rohit_Deshmukh.jpg
diff --git a/Images/Sanket_Mane.jpg b/Images/Sanket_Mane.jpg
diff --git a/Images/Zaki_Patel.jpg b/Images/Zaki_Patel.jpg
diff --git a/README.md b/README.md
@@ -96,4 +96,7 @@ Push your changes to your branch on GitHub :
 
 ```bash
 git push origin feature2
-```
+```
+
+
+
diff --git a/index.html b/index.html
@@ -32,26 +32,26 @@ <h4 style="color: black;"><b> RSDC </b></h4>
       <div class="collapse navbar-collapse justify-content-end" id="navbarSupportedContent">
         <ul class="navbar-nav ">
           <li class=" nav-item">
-            <a class="nav-link" href="#">About us</a>
+            <a class="nav-link" href="pages/about.html">About us</a>
           </li>
           <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown"
               aria-expanded="false">
               Departments
             </a>
             <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <li><a class="dropdown-item" href="/pages/departments/HR.html">HR Department</a></li>
-              <li><a class="dropdown-item" href="/pages/departments/Tech.html">Technical Department</a></li>
-              <li><a class="dropdown-item" href="/pages/departments/social.html">Social Department</a></li>
-              <li><a class="dropdown-item" href="/pages/departments/design.html">Design Department</a></li>
-              <li><a class="dropdown-item" href="/pages/departments/project.html">Project Department</a></li>
+              <li><a class="dropdown-item" href="pages/departments/HR.html">HR Department</a></li>
+              <li><a class="dropdown-item" href="pages/departments/Tech.html">Technical Department</a></li>
+              <li><a class="dropdown-item" href="pages/departments/social.html">Social Department</a></li>
+              <li><a class="dropdown-item" href="pages/departments/design.html">Design Department</a></li>
+              <li><a class="dropdown-item" href="pages/departments/project.html">Project Department</a></li>
             </ul>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="./pages/leads.html">Leads</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="../pages/blog/blogMain.html">Blog</a>
+            <a class="nav-link" href="pages/blog/blogMain.html">Blog</a>
           </li>
           <button class="btn btn-outline-primary" type="submit">Join Now</button>
         </ul>
@@ -203,4 +203,4 @@ <h5 class="text-uppercase">Revolution Software Development Club</h5>
 
 </body>
 
-</html>
+</html>
diff --git a/pages/blog/blogMain.css b/pages/blog/blogMain.css
@@ -55,4 +55,22 @@ a:link {
 
 .card img{
     width: 200px;
+
+}
+
+.image-container {
+    height: 200px; 
+    overflow: hidden;   
+}
+
+.image-container img {
+    width: 65%;
+    height: auto;
+    object-fit: cover;
+}
+
+/* Load more and show less buttons */
+.load-more-button,
+.show-less-button {
+  margin-top: 20px;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,4 +96,7 @@ Push your changes to your branch on GitHub : @@
     ```bash
     git push origin feature2
-    ```
+    ```