Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@karthiknadar1204
karthiknadar1204 authored Jun 26, 2023
2 parents 5df0bbc + 4f7bf8f commit 5db5560
Show file tree
Hide file tree
Showing 7 changed files with 292 additions and 79 deletions.
99 changes: 36 additions & 63 deletions AR_Meditate/meditation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,71 +119,44 @@ <h4 class="text-center my-5">
</div>
</div>

<!-- Footer -->
<footer
class="customFooter py-sm-1 md:w-full flex flex-col h-fit items-center justify-center bg-white"
> <div class="footerWrapper w-full px-12 lg:px-0 sm:w-2/3">
<!-- Row - 1 -->
<div
class="row-1 flex w-full items-center justify-center sm:justify-between flex-col"
>
<div
class="flex flex-col w-full sm:flex-row items-center justify-between"
>
<img
src="./Images/moksh.png"
alt="Moksh Logo"
class="w-32 h-32 my-2"
/>

<div
class="flex flex-col px-4 items-center sm:px-0 w-full sm:w-2/3"
>
<span
class="text-center italic font-bold text-indigo-600 mb-1 sm:border-double sm:border-b-4 sm:border-indigo-600"
>
A Spiritual Productivity Tool for Mental Wellness
</span>
<!-- Footer -->
<footer class="bg-gray-100">
<div class="footer-divide">
<div class="flex justify-center items-center">
<div class="w-32 h-32 my-2 rounded-full overflow-hidden">
<img src="../Images/New_Logo_2.png" alt="Moksh Logo" class="object-cover" />
</div>
</div>
<div class="footer-divide-text">
Moksh is a spiritual productivity tool designed for
individuals who want to unlock their potential and
achieve true balance in life. Join us on our journey to empower the world with spiritual knowledge</div>
</div>

<div
class="mt-1 w-full font-semibold flex items-center justify-center flex-col"
>
<span class="sm:text-xs text-md text-justify">
Moksh is a spiritual productivity tool designed for
individuals who want to unlock their potential and
achieve true balance in life.
</span>
<!-- Footer Socials -->
<div
class="socials mt-4 row-2 w-full flex justify-evenly capitalize font-semibold text-md sm:text-[11px]"
>
<a
href="https://twitter.com/ExperienceMoksh"
class="ease-in-out duration-300 hover:text-indigo-600"
><svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 24 24" id="twitter" width="40px" fill=" rgb(6, 6, 104)"><path d="M22,5.8a8.49,8.49,0,0,1-2.36.64,4.13,4.13,0,0,0,1.81-2.27,8.21,8.21,0,0,1-2.61,1,4.1,4.1,0,0,0-7,3.74A11.64,11.64,0,0,1,3.39,4.62a4.16,4.16,0,0,0-.55,2.07A4.09,4.09,0,0,0,4.66,10.1,4.05,4.05,0,0,1,2.8,9.59v.05a4.1,4.1,0,0,0,3.3,4A3.93,3.93,0,0,1,5,13.81a4.9,4.9,0,0,1-.77-.07,4.11,4.11,0,0,0,3.83,2.84A8.22,8.22,0,0,1,3,18.34a7.93,7.93,0,0,1-1-.06,11.57,11.57,0,0,0,6.29,1.85A11.59,11.59,0,0,0,20,8.45c0-.17,0-.35,0-.53A8.43,8.43,0,0,0,22,5.8Z"></path></svg></a
>
<a
href="https://github.com/akshitagupta15june/Moksh"
class="ease-in-out duration-300 hover:text-indigo-600"
><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="github" width="40px" fill="rgb(51, 51, 51)"><path d="M7.999 0C3.582 0 0 3.596 0 8.032a8.031 8.031 0 0 0 5.472 7.621c.4.074.546-.174.546-.387 0-.191-.007-.696-.011-1.366-2.225.485-2.695-1.077-2.695-1.077-.363-.928-.888-1.175-.888-1.175-.727-.498.054-.488.054-.488.803.057 1.225.828 1.225.828.714 1.227 1.873.873 2.329.667.072-.519.279-.873.508-1.074-1.776-.203-3.644-.892-3.644-3.969 0-.877.312-1.594.824-2.156-.083-.203-.357-1.02.078-2.125 0 0 .672-.216 2.2.823a7.633 7.633 0 0 1 2.003-.27 7.65 7.65 0 0 1 2.003.271c1.527-1.039 2.198-.823 2.198-.823.436 1.106.162 1.922.08 2.125.513.562.822 1.279.822 2.156 0 3.085-1.87 3.764-3.652 3.963.287.248.543.738.543 1.487 0 1.074-.01 1.94-.01 2.203 0 .215.144.465.55.386A8.032 8.032 0 0 0 16 8.032C16 3.596 12.418 0 7.999 0z"></path></svg></a
>
</div>
</div>
<div class="footer">
<div class='footer-list'>
<ul><a href="#" class="footer-items">About</a></ul>

<ul><a href="Blogs/Blog.html" class="footer-items">Blogs</a></li>
</div>

<div class="footer-socials">
<ul>
<a href="https://github.com/akshitagupta15june/Moksh">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" class="bi bi-github" viewBox="0 0 16 16">
<path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
</svg></a></ul>
<ul><a href="https://twitter.com/ExperienceMoksh">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" class="bi bi-twitter" viewBox="0 0 16 16">
<path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/>
</svg></a></ul>
</div>


<!-- Copyright -->
<div
class="row-3 copyright text-center font-semibold text-md sm:text-xs mt-4"
>
<p>Made with ❤️ by Akshita during XPRESSION'23</p>
<p class="text-rose-600 text-xs font-bold">
&copy; 2023 Moksh. All rights reserved.
</p>
</div>
</div>
</div>
</div>
</div>
</footer>
<div class="made-by"> Made with ❤️ by Akshita during XPRESSION'23</div>
<div class="copyright">&copy; Copyright 2023 by Moksh. All rights reserved.</div>
</div>
</footer>
</div>
</div>

Expand Down
39 changes: 38 additions & 1 deletion Blogs/Blog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
<link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet'>
<title>Blog</title>
<link rel="icon" type="image/x-icon" href="Images/New_Logo.svg" />
<link rel="stylesheet" href="../commonStyles.css">
<link rel="stylesheet" href="newBlogStyle.css">
</head>

Expand Down Expand Up @@ -258,8 +260,43 @@
</div>

<!-- Footer -->
<footer class="customFooter w-full flex flex-col h-fit items-center justify-center bg-gray-100"></footer>
<footer class="">
<div class="footer-divide">
<div class="flex justify-center items-center">
<div class="w-32 h-32 my-2 rounded-full overflow-hidden">
<img src="../Images/New_Logo_2.png" alt="Moksh Logo" class="object-cover" />
</div>
</div>
<div class="footer-divide-text">
Moksh is a spiritual productivity tool designed for
individuals who want to unlock their potential and
achieve true balance in life. Join us on our journey to empower the world with spiritual knowledge</div>
</div>

<div class="footer">
<div class='footer-list'>
<ul><a href="#" class="footer-items">About</a></ul>

<ul><a href="Blogs/Blog.html" class="footer-items">Blogs</a></li>
</div>

<div class="footer-socials">
<ul>
<a href="https://github.com/akshitagupta15june/Moksh">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" class="bi bi-github" viewBox="0 0 16 16">
<path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
</svg></a></ul>
<ul><a href="https://twitter.com/ExperienceMoksh">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" class="bi bi-twitter" viewBox="0 0 16 16">
<path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/>
</svg></a></ul>
</div>


<div class="made-by"> Made with ❤️ by Akshita during XPRESSION'23</div>
<div class="copyright">&copy; Copyright 2023 by Moksh. All rights reserved.</div>
</div>
</footer>
</div>
</div>

Expand Down
16 changes: 7 additions & 9 deletions Iskcon/event.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -147,7 +141,6 @@ button.start-btn {
display: inline-block;
padding: auto 20px;
}

.nav-menu {
margin-bottom: 0;
padding-left: 0;
Expand All @@ -168,6 +161,7 @@ button.start-btn {
transition: 0.3s;
letter-spacing: 1px;
margin: 0;
/* margin: 0 20px; */
}

.nav ul li a.active:hover {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions commonStyles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

/* Footer */
.footer{
background-color: rgb(243 244 246 / 1);
color: black;
}

.footer-items{
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,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="#" class="footer-items">Contact Us</a></ul>

<ul><a href="Blogs/Blog.html" class="footer-items">Blogs</a></li>
</div>

Expand Down
12 changes: 12 additions & 0 deletions shlok_page/motivation.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ p:hover {
object-fit: cover;
}


.nav {
height: 70px;
background-color: #2980b9 !important;
Expand Down Expand Up @@ -590,3 +591,14 @@ footer .quick-links ul li a:hover {
position: relative;
top:8rem;
}

.footer-logo{
max-width: 100%;
height: auto;
}

.footer-divide{
margin-left: 10rem;
margin-right: 10rem;
}

Loading

0 comments on commit 5db5560

Please sign in to comment.