Merge branch 'main' into RitiChandak-patch-1

akshitagupta15june · Jun 27, 2023 · 37e80f0 · 37e80f0
2 parents 77c1c84 + 1ad28c7
commit 37e80f0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/Blogs/depression.html b/Blogs/depression.html
@@ -36,9 +36,7 @@
  class="ml-3 text-xl sm:text-2xl uppercase font-semibold text-indigo-600 projectName tracking-widest ease-in-out duration-300 hover:text-slate-900">Moksh</span>
  </a>
  </div>
- <div class="rightSection">
-
- </div>
+
  </div>
 
  </div>

diff --git a/Iskcon/event.css b/Iskcon/event.css
@@ -98,19 +98,13 @@ button.start-btn {
  display: flex;
 }
 
-.nav-menu>li a{
- display: flex;
- justify-content: space-around;
-
-}
-
 .nav {
  height: 70px;
  background-color: #2980b9 !important;
  box-shadow: 0 3px 15px rgba(51, 49, 49, 0.4);
  display: flex;
  align-items: center;
- justify-content: flex-end;
+ justify-content: space-between;
  padding-right: 20px;
  position: sticky;
  z-index: 99;
@@ -147,7 +141,6 @@ button.start-btn {
  display: inline-block;
  padding: auto 20px;
 }
-
 .nav-menu {
  margin-bottom: 0;
  padding-left: 0;
@@ -168,6 +161,7 @@ button.start-btn {
  transition: 0.3s;
  letter-spacing: 1px;
  margin: 0;
+ /* margin: 0 20px; */
 }
 
 .nav ul li a.active:hover {
@@ -211,13 +205,17 @@ button.start-btn {
 a.dropdown-item{
  margin: 0 !important;
 }
-
+/* ul.dropdown-menu.show{
+ margin: 0;
+ padding: 0;
+} */
 .nav ul ul li a {
  line-height: 25px;
  padding: 10px 15px;
  box-shadow: 0 10px 10px rgba(0, 0, 0, 0.25);
 }
 
+
 /* Google Translate */
 #google_translate_element select {
  background-color: #f6edfd;

diff --git a/Iskcon/event.html b/Iskcon/event.html
@@ -230,9 +230,8 @@ <h2 class="w3-wide">
 
  <div class="footer">
  <div class='footer-list'>
- <ul><a href="#" class="footer-items">About</a></ul>
- <ul><a href="#" class="footer-items">Contact Us</a></ul>
- <ul><a href="#" class="footer-items">Blogs</a></li>
+ <ul><a href="../index.html" class="footer-items">About</a></ul>
+ <ul><a href="../Blogs/Blog.html" class="footer-items">Blogs</a></li>
  </div>
  <div class="footer-socials">
  <ul>

diff --git a/index.html b/index.html
@@ -239,7 +239,7 @@ <h1 class="text-xs uppercase font-semibold tracking-widest">Menu</h1>
  </div>
  </div>
 
- <div class="contentSection flex flex-col items-center pt-12 md:py-0 bg-gray-100">
+ <div class="contentSection flex flex-col items-center pt-12 md:py-0 bg-gray-100" id="mentalHealthComponent">
 
  <!-- Mental Health Problems -->
  <div class="mentalHealthVideo my-8 lg:w-3/4" id="mentalhealth">
@@ -475,7 +475,7 @@ <h1 class="text-indigo-600 text-center mb-10 uppercase font-semibold">
 
  <div class="footer">
  <div class='footer-list'>
- <ul><a href="#" class="footer-items">About</a></ul>
+ <ul><a href="#mentalHealthComponent" class="footer-items">About</a></ul>
 
  <ul><a href="Blogs/Blog.html" class="footer-items">Blogs</a></li>
  </div>