From 1b077ecb884e922b0869b7cc02b6cea8685a245b Mon Sep 17 00:00:00 2001 From: shivaniyuvrajyadav Date: Mon, 12 Jun 2023 10:02:26 +0530 Subject: [PATCH 001/113] solve #662 footer is added . --- AR_Meditate/meditation.html | 2 +- commonScript.js | 306 ++++++++++++++++++------------------ 2 files changed, 155 insertions(+), 153 deletions(-) diff --git a/AR_Meditate/meditation.html b/AR_Meditate/meditation.html index 558a2089..085a7b73 100644 --- a/AR_Meditate/meditation.html +++ b/AR_Meditate/meditation.html @@ -84,7 +84,7 @@

+ style="background-color: #2980b9 ; "> AR Meditate execution-while-not-rendered web-share width="100%" - height="530" + height="550" style="padding: 0; margin: 0" src="https://sketchfab.com/models/506d0a8f43884c458e5a78156151ff09/embed"> @@ -83,8 +84,72 @@

+ class="customFooter py-sm-1 md:w-full flex flex-col h-fit items-center justify-center bg-white" + >
+ +
+
+ Moksh Logo + +
+ + A Spiritual Productivity Tool for Mental Wellness + + +
+ + Moksh is a spiritual productivity tool designed for + individuals who want to unlock their potential and + achieve true balance in life. + + +
+ + +
+
+ + + +
+
+
+
+ + + + - \ No newline at end of file + From 1d05ef7edbd388e4219ac28ff8971145fcfed987 Mon Sep 17 00:00:00 2001 From: karthik Date: Fri, 16 Jun 2023 22:45:51 +0530 Subject: [PATCH 006/113] Added Logo --- AR_Meditate/meditation.css | 5 +++-- AR_Meditate/meditation.html | 2 +- Divine_page/story.css | 8 ++++++++ Divine_page/story.html | 4 ++-- Images/New_Logo_2.svg | 1 + Importance of Sloks/style.css | 10 +++++++++- Iskcon/event.css | 9 ++++++++- Iskcon/event.html | 30 ++---------------------------- Pomodro_page/reward.css | 8 ++++++++ Pomodro_page/reward.html | 2 +- Rejuvenate_page/rejuvenate.css | 8 ++++++++ Rejuvenate_page/rejuvenate.html | 2 +- index.html | 22 ++++++++++++++++++++-- quiz_page/quiz.css | 10 +++++++++- shlok_page/motivation.css | 9 ++++++++- style.css | 2 +- styleIndex.css | 2 +- 17 files changed, 91 insertions(+), 43 deletions(-) create mode 100644 Images/New_Logo_2.svg diff --git a/AR_Meditate/meditation.css b/AR_Meditate/meditation.css index 5937aaa0..d69c93f2 100644 --- a/AR_Meditate/meditation.css +++ b/AR_Meditate/meditation.css @@ -7,7 +7,7 @@ body { padding: 0; font-family: sans-serif; } - + iframe { min-height: 100% !important; } @@ -89,7 +89,8 @@ iframe { .navbar-logo img { width: 60px; background-color: antiquewhite; - border-radius: 10%; + border-radius: 50%; + object-fit: cover; } .navbar-logo span { diff --git a/AR_Meditate/meditation.html b/AR_Meditate/meditation.html index 8bcc651e..7dfa43ec 100644 --- a/AR_Meditate/meditation.html +++ b/AR_Meditate/meditation.html @@ -29,7 +29,7 @@ diff --git a/Divine_page/story.css b/Divine_page/story.css index 19179ae9..1c1c57cc 100644 --- a/Divine_page/story.css +++ b/Divine_page/story.css @@ -198,3 +198,11 @@ body { margin-right: auto; } + +.navbar-logo img { + width: 60px; + background-color: antiquewhite; + border-radius: 50%; + object-fit: cover; +} + diff --git a/Divine_page/story.html b/Divine_page/story.html index 2c2febdd..a03a5ed5 100644 --- a/Divine_page/story.html +++ b/Divine_page/story.html @@ -22,7 +22,7 @@ - +

From 8fb1aa01c813976cea76f4acbef4df01a6d7a73d Mon Sep 17 00:00:00 2001 From: abhinav-m22 Date: Sun, 25 Jun 2023 13:19:43 +0530 Subject: [PATCH 020/113] Footer update in shlok page --- commonStyles.css | 2 + shlok_page/motivation.css | 10 ++ shlok_page/motivation.html | 278 ++++++++++++++++++++----------------- 3 files changed, 161 insertions(+), 129 deletions(-) diff --git a/commonStyles.css b/commonStyles.css index 6cc50ca0..ed96713a 100644 --- a/commonStyles.css +++ b/commonStyles.css @@ -12,6 +12,8 @@ /* Footer */ .footer{ + background-color: rgb(243 244 246 / 1); + color: black; } .footer-items{ diff --git a/shlok_page/motivation.css b/shlok_page/motivation.css index 7fadbf9c..50bed52e 100644 --- a/shlok_page/motivation.css +++ b/shlok_page/motivation.css @@ -305,3 +305,13 @@ p:hover { border-radius: 50%; object-fit: cover; } + +.footer-logo{ + max-width: 100%; + height: auto; +} + +.footer-divide{ + margin-left: 10rem; + margin-right: 10rem; +} \ No newline at end of file diff --git a/shlok_page/motivation.html b/shlok_page/motivation.html index 3974f200..b89ae38f 100644 --- a/shlok_page/motivation.html +++ b/shlok_page/motivation.html @@ -4,17 +4,17 @@ Random Gita Shlok Generator - + + + + + + integrity="sha512-+4zCK9k+qNFUR5X+cKL9EIR+ZOhtIloNl9GIKS57V1MyNsYpYcUrUeQc9vNfzsWfV28IaLL3i96P9sdNyeRssA==" + crossorigin="anonymous" /> @@ -60,7 +60,7 @@
+ src="https://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit">
@@ -68,7 +68,7 @@ + href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> @@ -76,103 +76,107 @@
- -
- -
- - - - - - - Abandon all varieties of religion and just surrender unto Me. I - shall deliver you from all sinful reactions. Do not fear. - - - - - -
- Lord Sri Krishna - Bhagvad-gita 18.66
- -
- - -
-
- -
- - - - - - - Quote To be Displayed Here - - - - -
Author to be Displayed Here
- -
- - + +
+ +
+ + + + + + + Abandon all varieties of religion and just surrender unto Me. I + shall deliver you from all sinful reactions. Do not fear. + + + + + +
- Lord Sri Krishna - Bhagvad-gita 18.66
+ +
+ + +
+
+ +
+ + + + + + + Quote To be Displayed Here + + + + +
Author to be Displayed Here
+ +
+ + +
+
-
-
-
+

Sloks have changed lives of Great People

- Image 4 -

Mahatma Gandhi

-

- - 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. - - -

- -
-
- Image 4 -

Rabindranath Tagore

-

- Rabindranath Tagore, the Nobel laureate poet and philosopher from India, had a deep appreciation for the - spiritual and philosophical aspects of life. He frequently drew inspiration from the Upanishads, a collection of ancient Hindu scriptures, and incorporated their slokas into his literary works. - - -

- + Image 4 +

Mahatma Gandhi

+

+ + 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. + + +

+ -
- Image 4 -

Swami Vivekananda

-

- Swami Vivekananda, a prominent spiritual leader and disciple of Sri Ramakrishna, played a crucial role in introducing Hindu philosophy to the West. He often quoted slokas from ancient texts like the Upanishads and the Bhagavad Gita during his speeches and lectures. - - - -

- +
+
+ Image 4 +

Rabindranath Tagore

+

+ Rabindranath Tagore, the Nobel laureate poet and philosopher from India, had a deep appreciation for the + spiritual and philosophical aspects of life. He frequently drew inspiration from the Upanishads, a + collection of ancient Hindu scriptures, and incorporated their slokas into his literary works. + + +

+ +
+
+ Image 4 +

Swami Vivekananda

+

+ Swami Vivekananda, a prominent spiritual leader and disciple of Sri Ramakrishna, played a crucial role in + introducing Hindu philosophy to the West. He often quoted slokas from ancient texts like the Upanishads and + the Bhagavad Gita during his speeches and lectures. + + + +

+ +
+
- +


@@ -182,44 +186,60 @@

Swami Vivekananda




- +
-
- -

- Moksh -

-
-
-

- A Spiritual Productivity Tool for Mental Wellness -

-
-
-

- Moksh is a spiritual productivity tool designed for individuals who - want to unlock their potential and achieve true balance in life. -

+ -
-
+
+ From 94913d64d89d9fe823dfa4fc243400f0d18bd7f9 Mon Sep 17 00:00:00 2001 From: smritimangal26 Date: Sun, 25 Jun 2023 15:22:00 +0530 Subject: [PATCH 021/113] Iconremoved --- Blogs/depression.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Blogs/depression.html b/Blogs/depression.html index 8a381314..f3b1e339 100644 --- a/Blogs/depression.html +++ b/Blogs/depression.html @@ -36,7 +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
-
+
From a6e16005c1431f23cfafd983a445660458415094 Mon Sep 17 00:00:00 2001 From: rayarka26 <74251803+rayarka26@users.noreply.github.com> Date: Sun, 25 Jun 2023 16:31:11 +0530 Subject: [PATCH 022/113] Fixed Issue #904 Removed Contact Us and all redirections done --- Iskcon/event.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Iskcon/event.html b/Iskcon/event.html index b05fb2df..ad8e8ac2 100644 --- a/Iskcon/event.html +++ b/Iskcon/event.html @@ -230,9 +230,8 @@

-
+
@@ -475,7 +475,7 @@

- - - - +

From 22510dfee97f407de3401601d1f87db6e6d7497a Mon Sep 17 00:00:00 2001 From: techmannih Date: Sun, 25 Jun 2023 19:46:58 +0530 Subject: [PATCH 025/113] fix: website not responsive for small devices #891 --- AR_Meditate/meditation.html | 4 ++-- Blogs/Blog.html | 2 +- commonStyles.css | 1 + index.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AR_Meditate/meditation.html b/AR_Meditate/meditation.html index 68de2582..68b80e44 100644 --- a/AR_Meditate/meditation.html +++ b/AR_Meditate/meditation.html @@ -41,12 +41,12 @@
  • Blog
  • -

    Home +
  • + + Mental Health Problems +
  • Power @@ -244,12 +260,13 @@

    Menu

    - Mental Health Problems + Mental Health Problems

    -

    + +

    There are numerous mental problems affecting the people in modern society, including fear, false egos, anxiety, comparisons, competitions, peer pressure and stressful work environment. Mental From 5fe2c238174e3db9ceb2f21011ea7e70356f5024 Mon Sep 17 00:00:00 2001 From: Arun Maramraj Date: Tue, 27 Jun 2023 13:58:16 +0530 Subject: [PATCH 031/113] Update Words.html to add back button Adding the back button that leads to blogs page --- Blogs/Words.html | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Blogs/Words.html b/Blogs/Words.html index fc22d402..651d5d72 100644 --- a/Blogs/Words.html +++ b/Blogs/Words.html @@ -9,6 +9,9 @@ + + + @@ -25,12 +28,17 @@

  • - Power of knowledge Blogs + Blog
  • +
  • +

    After 4 breaks, take a 30-minute break.

    +
  • +
  • +

    Repeat the process until you complete all the tasks.

    +
  • +

    Good Luck!

    - -
    From 1e118d3a295bf4ec64cf56dc2e6e50cfeb66052a Mon Sep 17 00:00:00 2001 From: ankitjt <48979824+ankitjt@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:05:00 +0530 Subject: [PATCH 043/113] Updated Footer and made it responsive --- commonScript.js | 174 ++++++--- commonStyles.css | 35 +- index.html | 969 ++++++++++++++++++++++++++--------------------- 3 files changed, 676 insertions(+), 502 deletions(-) diff --git a/commonScript.js b/commonScript.js index 8a24b224..b9d54c1e 100644 --- a/commonScript.js +++ b/commonScript.js @@ -132,7 +132,7 @@ let customFooter = document.querySelector( ".customFooter" ), let navbarContent = `
    - Moksh Logo + Moksh Logo Moksh @@ -203,60 +203,129 @@ let customFooter = document.querySelector( ".customFooter" ), navbar.innerHTML = navbarContent let footerContent = ` -
    - -
    -
    - Moksh Logo - -
    - - A Spiritual Productivity Tool for Mental Wellness - - -
    - - Moksh is a spiritual productivity tool designed for - individuals who want to unlock their potential and - achieve true balance in life. - + + +
    +

    Sign Up for our newsletter:

    +

    Get weekly updates regarding Moksh.

    +
    - - -
    + + +
    + + + + + + + ` customFooter.innerHTML = footerContent @@ -267,6 +336,11 @@ contentWrapper.onscroll = () => contentWrapper.scrollTop > 5 ? navbar.classList.add( 'bg-slate-900', 'shadow-2xl' ) : navbar.classList.remove( 'bg-slate-900', 'shadow-2xl' ) } +let subscribeBtn = document.querySelector( '.subscribeBtn' ) +subscribeBtn.onclick = () => +{ + alert( 'It will be functional soon!!' ) +} let indexOpenDropDown = document.querySelector( '.indexOpenDropDown' ) indexOpenDropDown.onclick = () => diff --git a/commonStyles.css b/commonStyles.css index 23c8de83..8e1d7b62 100644 --- a/commonStyles.css +++ b/commonStyles.css @@ -4,6 +4,7 @@ * { font-family: 'Montserrat', sans-serif; box-sizing: border-box; + outline: none; } .projectName { @@ -11,14 +12,14 @@ } /* Footer */ -footer{ +footer { background-color: rgb(243 244 246 / 1); color: black; padding: 0; } -.footer-items{ +.footer-items { color: black; text-decoration: none; font-size: 18px; @@ -26,7 +27,7 @@ footer{ } -.footer-list{ +.footer-list { display: flex; flex-direction: row; justify-content: center; @@ -34,12 +35,13 @@ footer{ gap: 30px; } -.footer-list ul, .footer-socials ul { +.footer-list ul, +.footer-socials ul { margin: 0; padding: 0; } -.copyright{ +.copyright { color: black; font-size: small; text-align: center; @@ -48,20 +50,20 @@ footer{ font-size: 13px; } -.footer-items:hover::after{ +.footer-items:hover::after { transform: scale(1.1); transition: 400ms; width: 100%; color: blue; } -.footer-items::after{ - content:''; - display:block; +.footer-items::after { + content: ''; + display: block; height: 4px; - width:0; + width: 0; background: blue; - transition:all .5 + transition: all .5 } .footer-divide { @@ -75,13 +77,13 @@ footer{ font-size: 16px; } -.footer-divide-text{ +.footer-divide-text { text-align: left; padding-top: 30px; font-size: 16px !important; } -.footer-socials{ +.footer-socials { padding-top: 10px; padding-bottom: 10px; display: flex; @@ -90,14 +92,15 @@ footer{ align-items: center; } -.made-by{ +.made-by { text-align: center; font-weight: 500; margin-bottom: 5px; margin-top: 5px; font-size: 16px; } -.OmSymbol{ + +.OmSymbol { position: relative; height: 18vh; width: 11vw; @@ -106,7 +109,7 @@ footer{ } @media screen and (min-width: 280px) and (max-width: 912px) { - .OmSymbol{ + .OmSymbol { position: relative; height: 100px; width: 120px; diff --git a/index.html b/index.html index bfafa3ad..83b00a7b 100644 --- a/index.html +++ b/index.html @@ -1,526 +1,623 @@ - - - - - - Moksh - - - - - -
    - - -