Merge branch 'main' of https://github.com/KaranMegha/Prakarsh-23

SvitPrakarsh · Feb 9, 2023 · c47c858 · c47c858
2 parents 2730355 + 67f5f85
commit c47c858
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 14 deletions.
diff --git a/public/assests/Events/innovative.png b/public/assests/Events/innovative.png
diff --git a/public/assests/Events/sharks.png b/public/assests/Events/sharks.png
diff --git a/src/App.jsx b/src/App.jsx
@@ -8,7 +8,7 @@ import Event from "./components/Events/Event";
 import Sponsor from "./components/Sponsor/Sponsor";
 import { NavBar } from "./components/Nav/NavBar";
 import Glimpse from "./components/Glimpse/Glimpse";
-import Signup from "./components/signup/Signup";
+import Signup from "./components/Signup/Signup";
 import { render } from "@testing-library/react";
 const App = () => {
 
@@ -27,7 +27,7 @@ const App = () => {
         <About />
         <Event />
         {/* <Team /> */}
-        {/* <Sponsor />  */}
+        {/* <Sponsor /> */}
         {/* <Signup/> */}
         <Glimpse />
         <Footer />

diff --git a/src/components/Events/Event.css b/src/components/Events/Event.css
@@ -8,8 +8,7 @@
                 -5px -5px 10px rgba(172, 112, 255, 0.33);
     width: 17.5rem;
     /* height: fit-content; */
-    filter: drop-shadow(5px 5px 10px rgba(172, 112, 255, 0.33));
-    margin: 1.5rem 0;  
+    filter: drop-shadow(5px 5px 10px rgba(172, 112, 255, 0.33));  
 }
 .bg{
     margin: 15px;

diff --git a/src/components/Events/Event.jsx b/src/components/Events/Event.jsx
@@ -31,31 +31,31 @@ function Event() {
     },
     {
       imgurl: "assests/Events/innovative.png",
-      title: "arcadian evovle",
+      title: "inovative heist",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/sharks.png",
-      title: "s.h.a.r.k.s",
+      imgurl: "assests/Events/cyber.png",
+      title: "wheels & wings",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/handson.png",
-      title: "Hands-on",
+      imgurl: "assests/Events/cyber.png",
+      title: "wheels & wings",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/ws.png",
-      title: "workshop",
+      imgurl: "assests/Events/cyber.png",
+      title: "wheels & wings",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/fab.png",
-      title: "Fab-Lab",
+      imgurl: "assests/Events/cyber.png",
+      title: "wheels & wings",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },

diff --git a/src/components/Team/Team.jsx b/src/components/Team/Team.jsx
@@ -97,7 +97,7 @@ function Team() {
                       </Nav.Item>
                     </Nav>
                     <Tab.Content
-                      id="slideInUp"
+                      id="slideInDown "
                       className={isVisible ? "" : ""}
                     >
                       <Tab.Pane eventKey="first">

diff --git a/src/components/signup/Signup.css b/src/components/signup/Signup.css
@@ -32,3 +32,53 @@
 }
 
 
+<<<<<<< HEAD
+.scontent{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    gap: 30px;
+
+}
+
+.inputbox{
+    position: relative;
+    width: 250px;
+}
+
+.inputbox input{
+    width: 100%;
+    padding: 10px;
+    border: 1px solid  rgb(1, 209, 105);
+    background: rgb(1, 15, 20,0.25);
+    border-radius: 5px;
+    outline: none;
+    color: #fff;
+    font-size: 1em; 
+
+}
+
+.inputbox span{
+
+    position: absolute;
+    left:0;
+    padding: 10px;
+    pointer-events: none;
+    font-size: 1em;
+    color: rgb(1, 209, 105,0.5);
+
+    text-transform: uppercase;
+}
+
+.inputbox .input:valid ~ span,
+.inputbox .input:valid ~  span :focus
+{
+
+}
+
+
+
+
+=======
+>>>>>>> 8823b651373b5423cdf7c57224838b969736e12b
diff --git a/src/components/signup/Signup.jsx b/src/components/signup/Signup.jsx
@@ -9,13 +9,29 @@ const Signup = () => {
                <p> Sign in now and register for upcoming events and <br/>
                      future announcements.</p>
             </div>
+            <div className="scontent">
+                <div className="inputbox">
+              <input type="email"  required="required" />
+              <span>
+                Email
+              </span>
+            </div>
+            <div className="sbtn">
+              <button type="button">Get Link</button>
+            </div>
+
+            </div>
 
+<<<<<<< HEAD
+=======
              <div className="s-content">
               <div className="email">
                 Email: <input type="email"/> 
               </div>
              </div>
+>>>>>>> 8823b651373b5423cdf7c57224838b969736e12b
 
+