From 60687f5bd2404c16ab38dd0aa64c956a27f56330 Mon Sep 17 00:00:00 2001 From: AKSHITA GUPTA <57909583+akshitagupta15june@users.noreply.github.com> Date: Sat, 24 Jun 2023 13:19:15 +0530 Subject: [PATCH 1/5] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f0cc2063..e5ef697b 100644 --- a/index.html +++ b/index.html @@ -476,7 +476,7 @@

- +
From ef74b57e1afc36bc6995ac20650a152fd35fe188 Mon Sep 17 00:00:00 2001 From: rayarka26 <74251803+rayarka26@users.noreply.github.com> Date: Sat, 24 Jun 2023 16:59:10 +0530 Subject: [PATCH 2/5] Fixed Issue #874 Blog.html changed to same as Index.html --- Blogs/Blog.html | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/Blogs/Blog.html b/Blogs/Blog.html index 4b7eeeab..3559b62e 100644 --- a/Blogs/Blog.html +++ b/Blogs/Blog.html @@ -5,8 +5,10 @@ + Blog + @@ -258,8 +260,43 @@
- + From 667085e12a58997374c7a08847104dbc38dc6a17 Mon Sep 17 00:00:00 2001 From: Gaurav Pratap Singh <85905403+gauravsingh1281@users.noreply.github.com> Date: Sun, 25 Jun 2023 07:21:58 +0000 Subject: [PATCH 3/5] Issue No. #880 Solved Footer Section Style Updated Like Index.html --- AR_Meditate/meditation.html | 99 ++++++++++++++----------------------- 1 file changed, 36 insertions(+), 63 deletions(-) diff --git a/AR_Meditate/meditation.html b/AR_Meditate/meditation.html index 9fcf7db4..68de2582 100644 --- a/AR_Meditate/meditation.html +++ b/AR_Meditate/meditation.html @@ -119,71 +119,44 @@

- - +
Made with ❤️ by Akshita during XPRESSION'23
+
© Copyright 2023 by Moksh. All rights reserved.
+ + From 8fb1aa01c813976cea76f4acbef4df01a6d7a73d Mon Sep 17 00:00:00 2001 From: abhinav-m22 Date: Sun, 25 Jun 2023 13:19:43 +0530 Subject: [PATCH 4/5] 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. -

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

- Made with ❤️ by Akshita during XPRESSION'23 -

-

- © 2023 Moksh. All rights reserved. -

+ +
+
+ + +
+ +
+ + +
+ + +
Made with ❤️ by Akshita during XPRESSION'23
+
© Copyright 2023 by Moksh. All rights reserved.
+
+ From a4f425c3ea34e87a9310726d541f7f00073537ff Mon Sep 17 00:00:00 2001 From: Disha Modi Date: Mon, 26 Jun 2023 09:44:48 +0530 Subject: [PATCH 5/5] Fixing bug in Iskcon navbar --- Iskcon/event.css | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Iskcon/event.css b/Iskcon/event.css index 933b28ec..500ad99e 100644 --- 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;