Skip to content

Commit

Permalink
Merge pull request #922 from ritik48/fix-issue-884
Browse files Browse the repository at this point in the history 
[Fixes #884] Made Footer in Pomodoro Same as Index
  • Loading branch information
@akshitagupta15june
akshitagupta15june authored Jun 27, 2023
2 parents 50ec9fd + 544157a commit 918441f
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 51 deletions.
6 changes: 6 additions & 0 deletions Pomodro_page/reward.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,9 @@ button:active {
object-fit: cover;
}



footer img {
width: 128px;
border-radius: 50%;
}
98 changes: 48 additions & 50 deletions Pomodro_page/reward.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Pomodoro Rule</title>

<link href="../style.css" rel="stylesheet" type="text/css" />
<script src="../script.js"></script>



<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato">
<link rel="stylesheet" href="fontawesome.min.css">
Expand All @@ -22,10 +25,16 @@
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" />

<link href="../style.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="../commonStyles.css" />

<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" />

</head>

<body>
<script src="script.js"></script>

<!-- Navbar Start-->

<div class="nav">
Expand Down Expand Up @@ -111,7 +120,6 @@ <h2>Good Luck!</h2>



<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" />

<div id="about" class="container py-3">
<div class="row">
Expand Down Expand Up @@ -141,59 +149,49 @@ <h1>Pomodoro Spiritual Break</h1>
</div>



<!-- Footer -->
<footer class="indexFooter md:w-full flex flex-col h-fit items-center justify-center py-12 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/New_Logo.svg" 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>

<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="#" class="ease-in-out duration-300 hover:text-indigo-600">Twitter</a>
<a href="#" class="ease-in-out duration-300 hover:text-indigo-600">Facebook</a>
<a href="#" class="ease-in-out duration-300 hover:text-indigo-600">Instagram</a>
<a href="#" class="ease-in-out duration-300 hover:text-indigo-600">Github</a>
</div>
</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>

<!-- 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="black" 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="black" 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>
</footer>




<!-- <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script> -->



Expand Down
14 changes: 13 additions & 1 deletion commonStyles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
}

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

padding: 0;
}

.footer-items{
Expand All @@ -32,13 +34,18 @@
gap: 30px;
}

.footer-list ul, .footer-socials ul {
margin: 0;
padding: 0;
}

.copyright{
color: black;
font-size: small;
text-align: center;
padding-bottom: 30px;
font-weight: 700;
font-size: 13px;
}

.footer-items:hover::after{
Expand All @@ -65,11 +72,15 @@
gap: 4rem;
margin-left: 10rem;
margin-right: 10rem;

font-size: 16px;
}

.footer-divide-text{
text-align: left;
padding-top: 30px;

font-size: 16px !important;
}

.footer-socials{
Expand All @@ -86,4 +97,5 @@
font-weight: 500;
margin-bottom: 5px;
margin-top: 5px;
font-size: 16px;
}

0 comments on commit 918441f

Please sign in to comment.