Merge pull request #21 from ellen-rose-james/updates

updated ui
ellen-rose-james · Oct 9, 2024 · d7ffdb9 · d7ffdb9
2 parents aeb2c35 + 9b447c3
commit d7ffdb9
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 18 deletions.
diff --git a/about.html b/about.html
@@ -144,12 +144,12 @@ <h3>Address</h3>
                   <br>
                   <a href="http://www.linkedin.com/in/ellenrosejames" style="text-decoration: none;">Ellen Rose James</a>
                   <br>
-                  <a href="https://github.com/dhjr" style="text-decoration: none;">Dhananjay R</a>
+                  <a href="https://www.linkedin.com/in/dhananjayr/" style="text-decoration: none;">Dhananjay R</a>
                 </p>
               </div>
 
               <div class="footer-map">
-                <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3934.19079391124!2d76.62031297484009!3d9.578815990506149!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3b062d96b2fe8ed9%3A0xbade243e087b408!2sRAJIV%20GANDHI%20INSTITUTE%20OF%20TECHNOLOGY%2C%20KOTTAYAM!5e0!3m2!1sen!2sin!4v1728241993898!5m2!1sen!2sin" width="250" height="250" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
+                <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3934.19079391124!2d76.62031297484009!3d9.578815990506149!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3b062d96b2fe8ed9%3A0xbade243e087b408!2sRAJIV%20GANDHI%20INSTITUTE%20OF%20TECHNOLOGY%2C%20KOTTAYAM!5e0!3m2!1sen!2sin!4v1728241993898!5m2!1sen!2sin" width="250" height="250" style="border:0; border-radius: 20px;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
               </div>
         </footer>
 

diff --git a/assets/css/about.css b/assets/css/about.css
@@ -304,7 +304,7 @@
     display: flex;
     gap: 20px;
     margin-bottom: 2rem;
-    margin-left: 3rem;
+    margin-left: 0rem;
   }
 
   .social-icons a .fab {
@@ -504,7 +504,7 @@
     }
 
     .content {
-      margin: 0;
+      margin: auto;
       padding: 0; 
     }
 

diff --git a/assets/css/events.css b/assets/css/events.css
@@ -359,7 +359,7 @@ body::before {
   display: flex;
   gap: 20px;
   margin-bottom: 2rem;
-  margin-left: 3rem;
+  margin-left: 0rem;
 }
 
 .social-icons a .fab {

diff --git a/assets/css/gallery.css b/assets/css/gallery.css
@@ -276,7 +276,7 @@ body::before {
   display: flex;
   gap: 20px;
   margin-bottom: 2rem;
-  margin-left: 3rem;
+  margin-left: 0rem;
 }
 
 .social-icons a .fab {

diff --git a/assets/css/rex-landing.css b/assets/css/rex-landing.css
@@ -35,6 +35,7 @@ body::before {
 
 /* Blob and Blur Effects */
 #blob {
+  visibility: visible;
   background-color: #f0f0e4;
   height: 24vmax;
   aspect-ratio: 1;
@@ -368,6 +369,10 @@ body::before {
   .bg-robot {
     display: none;
   }
+  #blob
+  {
+    display: none;
+  }
   .hero-content {
     text-align: center;
     align-items: center;

diff --git a/assets/js/global.js b/assets/js/global.js
@@ -2,14 +2,18 @@
 const menuButton = document.getElementById('menuButton');
 const menuOverlay = document.getElementById('menuOverlay');
 const closeButton = document.getElementById('closeButton');
+const blob = document.getElementById("blob");
 let menuOpen = false;
 
 menuButton.addEventListener('click', () => {
-    if (!menuOpen) {
-        document.body.classList.add('menu-open');
+  if (!menuOpen) {
+    window.scrollTo(0,0);
+    document.querySelector('body').style.overflowY='hidden';
+    document.body.classList.add('menu-open');
         menuOpen = true;
     } else {
         document.body.classList.remove('menu-open');
+        document.querySelector('body').style.overflowY='scroll';
         menuOpen = false;
     }
 });
@@ -21,7 +25,7 @@ closeButton.addEventListener('click', () => {
 
 
 // Blob Effect
-const blob = document.getElementById("blob");
+
 
 window.onpointermove = event => { 
   const { clientX, clientY } = event;

diff --git a/events.html b/events.html
@@ -82,6 +82,7 @@ <h2 class="event-title">EVENTS</h2>
           </div>          
           <div class="box box2">
             <h2>Pre Event 1: Mathemathical Modelling for Robotics </h2>
+            <br><br>
             <p>
               "The only impossible journey is the one you never begin. "
               <br />
@@ -92,9 +93,8 @@ <h2>Pre Event 1: Mathemathical Modelling for Robotics </h2>
               <br />
               Topic:&emsp;&ensp;<b>Mathemathical Modelling for Robotics</b>
               <br />
-              Speakers:
-              <br />
-              &emsp;&emsp;&emsp;&emsp;<b>Abdul Rahim</b>,<br>&emsp;&emsp;&emsp;&emsp;Research and Development Enginner at Zeus Numerix
+              Speaker:
+              <b>Abdul Rahim</b>,<br>&emsp;&emsp;&emsp;&emsp;Research and Development Engineer,<br>&emsp;&emsp;&emsp;&emsp;Zeus Numerix
               <br />
 <!--               
               &emsp;&emsp;&emsp;&emsp;<b>Rishad</b>, Embedded Engineer
@@ -126,6 +126,7 @@ <h2>Pre Event 1: Mathemathical Modelling for Robotics </h2>
           </div>          
           <div class="box box2">
             <h2>Workshop 1: Computer Vision</h2>
+            <br><br>
             <p>
               "The best way to predict the future is to create it."
               <br />
@@ -171,6 +172,7 @@ <h2>Workshop 1: Computer Vision</h2>
           </div>
           <div class="box box2">
             <h2>Workshop 2: Robotic Arm Building</h2>
+            <br><br>
             <p>
               “A lot of robotics is just too fantastic for people to believe.”
               <br />
@@ -211,7 +213,8 @@ <h2>Workshop 2: Robotic Arm Building</h2>
             />
           </div>
           <div class="box box2">
-            <h2>Workshop 3: Robotic Arm Building</h2>
+            <h2>Workshop 3: Differential Drive Robot using ROS</h2>
+            <br><br>
             <p>
               "Technology is best when it brings people together."
               <br>
@@ -257,6 +260,7 @@ <h2>Workshop 3: Robotic Arm Building</h2>
 
           <div class="box box2">
             <h2>Talk Session 1: Robotics in Assistive Technology</h2>
+            <br><br>
             <p>
               "Innovation distinguishes between a leader and a follower." 
               <br>
@@ -348,12 +352,12 @@ <h3>Address</h3>
             <br>
             <a href="https://github.com/ellen-rose-james" target="_blank" style="text-decoration: none;">Ellen Rose James</a>
             <br>
-            <a href="https://github.com/dhjr" target="_blank" style="text-decoration: none;">Dhananjay R</a>
+            <a href="https://www.linkedin.com/in/dhananjayr/" target="_blank" style="text-decoration: none;">Dhananjay R</a>
           </p>
         </div>
 
         <div class="footer-map">
-          <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3934.19079391124!2d76.62031297484009!3d9.578815990506149!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3b062d96b2fe8ed9%3A0xbade243e087b408!2sRAJIV%20GANDHI%20INSTITUTE%20OF%20TECHNOLOGY%2C%20KOTTAYAM!5e0!3m2!1sen!2sin!4v1728241993898!5m2!1sen!2sin" width="250" height="250" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
+          <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3934.19079391124!2d76.62031297484009!3d9.578815990506149!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3b062d96b2fe8ed9%3A0xbade243e087b408!2sRAJIV%20GANDHI%20INSTITUTE%20OF%20TECHNOLOGY%2C%20KOTTAYAM!5e0!3m2!1sen!2sin!4v1728241993898!5m2!1sen!2sin" width="250" height="250" style="border:0; border-radius: 20px;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
         </div>
       </footer>
     </div>

diff --git a/gallery.html b/gallery.html
@@ -108,12 +108,12 @@ <h3>Address</h3>
                   <br>
                   <a href="http://www.linkedin.com/in/ellenrosejames" style="text-decoration: none;">Ellen Rose James</a>
                   <br>
-                  <a href="https://github.com/dhjr" style="text-decoration: none;">Dhananjay R</a>
+                  <a href="https://www.linkedin.com/in/dhananjayr/" style="text-decoration: none;">Dhananjay R</a>
                 </p>
               </div>
 
               <div class="footer-map">
-                <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3934.19079391124!2d76.62031297484009!3d9.578815990506149!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3b062d96b2fe8ed9%3A0xbade243e087b408!2sRAJIV%20GANDHI%20INSTITUTE%20OF%20TECHNOLOGY%2C%20KOTTAYAM!5e0!3m2!1sen!2sin!4v1728241993898!5m2!1sen!2sin" width="250" height="250" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
+                <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3934.19079391124!2d76.62031297484009!3d9.578815990506149!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3b062d96b2fe8ed9%3A0xbade243e087b408!2sRAJIV%20GANDHI%20INSTITUTE%20OF%20TECHNOLOGY%2C%20KOTTAYAM!5e0!3m2!1sen!2sin!4v1728241993898!5m2!1sen!2sin" width="250" height="250" style="border:0; border-radius: 20px;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
               </div>
         </footer>
 

diff --git a/index.html b/index.html
@@ -16,7 +16,7 @@
 
 <body>
 
-    <di class="container">
+    <div class="container">
 		<div id="blob"></div>
 
         <header class="header">