Skip to content

Commit

Permalink
Merge pull request #953 from Once-kaur/fix-issue-875
Browse files Browse the repository at this point in the history
blog page moksh logo changed to same as index page
  • Loading branch information
akshitagupta15june authored Jun 29, 2023
2 parents 79d6413 + 117b0cf commit c8c633b
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 15 deletions.
5 changes: 3 additions & 2 deletions Blogs/Blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<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="icon" type="image/x-icon" href="Images/New_Logo_2.png" /> -->
<link rel="icon" type="image/x-icon" href="../Images/New_Logo_2.png" />
<link rel="stylesheet" href="../commonStyles.css">
<link rel="stylesheet" href="newBlogStyle.css">
</head>
Expand Down Expand Up @@ -293,7 +294,7 @@
</div>


<div class="made-by"> Made with ❤️ by Akshita during XPRESSION'23</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>
Expand Down
2 changes: 1 addition & 1 deletion Blogs/Strength.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.4/font/bootstrap-icons.css" />
<link rel="icon" type="image/x-icon" href="Images/moksh.jpeg" />
<link rel="icon" type="image/x-icon" href="../Images/New_Logo_2.png" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" />
<link rel="stylesheet" href="../commonStyles.css" type="text/css">
<link href="newBlogStyle.css" rel="stylesheet" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion Blogs/Words.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<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>
<title>Blog- Words</title>
<link rel="icon" type="image/x-icon" href="Images/moksh.jpeg" />
<link rel="icon" type="image/x-icon" href="../Images/New_Logo_2.png" />
<link rel="stylesheet" href="newBlogStyle.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.9.2/html2pdf.bundle.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion Blogs/cardinalVices.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class="fixed navbar text-indigo-700 top-0 px-4 sm:px-8 py-4 ease-in-out duration-300 flex z-30 items-center justify-between w-full left-0">
<div class="leftSection">
<a class="flex items-center" href="../index.html">
<img src="../Images/moksh.png" alt="Moksh Logo" class="w-16 h-16" />
<img src="../Images/New_Logo_2.svg" alt="Moksh Logo" class="w-16 h-16" />
<span
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>
Expand Down
4 changes: 2 additions & 2 deletions Blogs/depression.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<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>
<title>Blog- Depression & Suicide</title>
<link rel="icon" type="image/x-icon" href="Images/moksh.jpeg" href="../index.html" />
<link rel="icon" type="image/x-icon" href="../Images/New_Logo_2.png" href="../index.html" />
<link rel="stylesheet" href="newBlogStyle.css">
<script type="text/javascript" src="https://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
</head>
Expand All @@ -31,7 +31,7 @@
class="fixed navbar text-indigo-700 top-0 px-4 sm:px-8 py-4 ease-in-out duration-300 flex z-30 items-center justify-between w-full left-0">
<div class="leftSection">
<a class="flex items-center" href="../index.html">
<img src="../Images/moksh.png" alt="Moksh Logo" class="w-16 h-16" />
<img src="../Images/New_Logo_2.png" alt="Moksh Logo" class="w-16 h-16" />
<span
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>
Expand Down
6 changes: 3 additions & 3 deletions commonScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let customFooter = document.querySelector( ".customFooter" ),
<h1 class="text-xs uppercase font-semibold tracking-widest">Menu</h1>
</div>
<img src="../Images/moksh.png" alt="" class="h-36 w-36 mx-auto" />
<img src="../Images/New_Logo_2.png" alt="" class="h-36 w-36 mx-auto" />
<!-- Row - 2 -->
<div class="">
Expand Down Expand Up @@ -132,7 +132,7 @@ let customFooter = document.querySelector( ".customFooter" ),
let navbarContent = `
<div class="leftSection">
<a class="flex items-center" href="../index.html">
<img src="../Images/moksh.png" alt="Moksh Logo" class="lg:w-14 lg:h-14 w-12 h-12 hover:animate-spin " />
<img src="../Images/New_Logo_2.png" alt="Moksh Logo" class="lg:w-14 lg:h-14 w-12 h-12 hover:animate-spin " />
<span
class="ml-3 text-base lg:text-2xl uppercase font-semibold projectName tracking-widest ease-in-out duration-300 hover:text-indigo-600">Moksh</span>
</a>
Expand Down Expand Up @@ -207,7 +207,7 @@ let customFooter = document.querySelector( ".customFooter" ),
<!-- 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" />
<img src="../Images/New_Logo_2.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
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<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>Moksh</title>
<link rel="icon" type="image/x-icon" href="Images/New_Logo.svg" />
<link rel="icon" type="image/x-icon" href="Images/New_Logo_2.png" />
<link rel="stylesheet" href="commonStyles.css" />
</head>

Expand Down
6 changes: 2 additions & 4 deletions shlok_page/motivation.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css"
integrity="sha512-+4zCK9k+qNFUR5X+cKL9EIR+ZOhtIloNl9GIKS57V1MyNsYpYcUrUeQc9vNfzsWfV28IaLL3i96P9sdNyeRssA=="
crossorigin="anonymous" />
<link rel="icon" type="image/x-icon" href="../Images/moksh.jpeg">
<link rel="icon" type="image/x-icon" href="../Images/New_Logo_2.png">
</head>

<body>
Expand All @@ -25,7 +25,7 @@
<div class="nav">
<!-- Nav Logo & Name -->
<div class="navbar-logo">
<img src="../Images/New_Logo.svg" alt="Moksh Logo" />
<img src="../Images/New_Logo_2.png" alt="Moksh Logo" />
<a href="../index.html"><span>Moksh</span></a>
</div>

Expand Down Expand Up @@ -138,8 +138,6 @@ <h3>Mahatma Gandhi</h3>
Mahatma Gandhi, the revered leader of India's independence movement, was deeply influenced by the teachings
of the Bhagavad Gita, a sacred Hindu scripture. The Bhagavad Gita contains numerous slokas that emphasize
the importance of selflessness, non-violence, and the pursuit of truth.


</p>
<div class="btn-shift-2">
<a href="../Importance of Sloks/Great People.html"><button class="learn-more">Learn More</button></a>
Expand Down

0 comments on commit c8c633b

Please sign in to comment.