Merge branch 'TCP-Tech:dev' into dev

TCP-Tech · Sep 29, 2023 · 8846313 · 8846313
2 parents bf0fe58 + 4608637
commit 8846313
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/public/mouse.css b/public/mouse.css
@@ -75,3 +75,8 @@
     top: 12px;
   }
 }
+@media (width<=800px){
+  .ghost{
+    display: none;
+  }
+}
diff --git a/src/components/teamCard3/TeamCard3.css b/src/components/teamCard3/TeamCard3.css
@@ -57,8 +57,8 @@
   transform: scale(1.1);
 }
 
-.overall{
-  transform: translateY(-50px);
+.overall {
+  transform: translateY(-50px); /* Adjust the translateY value as needed */
 }
 
 .normal{
@@ -157,3 +157,31 @@
     top: 0;
   }
 }
+@media (max-width: 768px) {
+  .normal{
+    transform: translateY(10px);
+    order: 2;
+  }
+  .codeutsava__team-card3 {
+    flex-direction: column; 
+  }
+
+  .codeutsava__team-card3.normal {
+    transform: translateY(10px); 
+  }
+
+  .codeutsava__team-card3.overall {
+    transform: none; 
+  }
+}
+@media (min-width: 769px) and (max-width: 1024px) {
+  .normal{
+    order: 2;
+  }
+  .overall{
+    transform: translateY(10px);
+  }
+  .codeutsava__team-card3 {
+    flex-direction: row; /* Reset flex direction to row for tablets */
+  }
+}
diff --git a/src/pages/home/sections/section1/Section1.css b/src/pages/home/sections/section1/Section1.css
@@ -95,7 +95,15 @@
   width: 24px;
   margin-right: 8px;
 }
-
+.codeutsava__section1-container2{
+  display: flex;
+  flex-direction: row;
+}
+@media only screen and (max-width: 1024px){
+.codeutsava__section1-discord{
+  margin-right: 18px;
+}
+}
 .codeutsava__section1-discord {
   display: flex;
   justify-content: left;
@@ -175,7 +183,7 @@ button.codeutsava__section1-intro-audio-btn {
   padding-top:4px ;
   border: none;
   outline: none;
-  cursor: pointer
+  cursor: pointer;
 }
 .codeutsava__section1-side-links li button:hover {
   list-style: none;

diff --git a/src/pages/home/sections/section1/Section1.js b/src/pages/home/sections/section1/Section1.js
@@ -229,6 +229,7 @@ const Section1 = () => {
             data-button-theme="dark-inverted"
             style={{ height: "44px", width: "312px" }}
           ></div>
+          <div className="codeutsava__section1-container2">
           <div className="codeutsava__section1-discord">
             <a
               className="codeutsava__section1-discord-link"
@@ -247,6 +248,7 @@ const Section1 = () => {
               Steps To Register On Devfolio
             </a>
           </div>
+          </div>
         </motion.div>
       </div>
       <motion.ul