conflict in index changed

DCS-CUSAT · Jul 21, 2023 · b0f8bdf · b0f8bdf
2 parents f9b5146 + 3e7f9fa
commit b0f8bdf
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+# editor config folder
+.vscode/
+
+# testing folder
+testings/
+
+# html hint config
+.hintrc
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -402,7 +402,7 @@ h6 {
 #hero {
   width: 100%;
   height: 80vh;
-  background: url("../img/hero-bg.jpg") top center;
+  background: url("../images/dcs_banner.jpeg") top center;
   background-size: cover;
   position: relative;
 }
@@ -713,7 +713,8 @@ section {
   align-items: center;
   padding: 20px;
   transition: 0.3s;
-  border: 1px solid #eef0ef;
+  border: 2px solid #eef0ef;
+  border-radius: 10px;
 }
 
 .features .icon-box i {
@@ -1653,4 +1654,45 @@ address{
   background: #3ac162;
   color: #fff;
   text-decoration: none;
+}
+
+/* Vision and Mission */
+.mission-heading {
+  padding-top: 27.5px;
+  color: #444444;
+}
+
+.vision-heading {
+  color: #444444;
+}
+
+/* Icon boxes for about-us section */
+.about-us-icon-box-container {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 20px;
+}
+
+.about-us-icon-box {
+  flex: 1 0 300px;
+  text-align: center;
+  border: 2px solid #eef0ef;
+  border-radius: 15px;
+  padding: 15px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+}
+
+.about-us-title {
+  font-weight: bold;
+  color: #444444;
+  padding: 10px;
+}
+
+.about-us-icon-box:hover {
+  border: 2px solid #3ac162;
 }
diff --git a/assets/images/dcs_banner.jpeg b/assets/images/dcs_banner.jpeg
diff --git a/index.html b/index.html
@@ -58,14 +58,13 @@ <h1 class="logo me-auto"><a href="index.html">Mentor</a></h1>
             <li><a class="active" href="index.html">Home</a></li>
             <li><a href="about.html">About</a></li>
             <li><a href="courses.html">Courses</a></li>
-            <!-- <li><a href="trainers.html">Trainers</a></li> -->
             <li class="dropdown">
               <a href="#"
                 ><span>People</span> <i class="bi bi-chevron-down"></i
               ></a>
               <ul>
                 <li><a href="faculties.html ">Faculties</a></li>
-                <li><a href="staff.html">staff</a></li>
+                <li><a href="staff.html" class="active">staff</a></li>
               </ul>
             </li>
             <li><a href="events.html">Events</a></li>