Merge pull request #14 from mehul1409/main

integrate tailwind css
osdc · Jan 26, 2024 · f1a1e6d · f1a1e6d
2 parents 45c442a + ebb07eb
commit f1a1e6d
Show file tree

Hide file tree

Showing 35 changed files with 1,161 additions and 170 deletions.
diff --git a/images/bottom left blob.png b/images/bottom left blob.png
diff --git a/images/bottom right blob.png b/images/bottom right blob.png
diff --git a/images/discord_5968759 1.png b/images/discord_5968759 1.png
diff --git a/images/facebook_1051309 1.png b/images/facebook_1051309 1.png
diff --git a/images/github_3488425 1.png b/images/github_3488425 1.png
diff --git a/images/left blob.png b/images/left blob.png
diff --git a/images/logo.png b/images/logo.png
diff --git a/images/osdc.png b/images/osdc.png
diff --git a/images/right blob lower.png b/images/right blob lower.png
diff --git a/images/right blob upper.png b/images/right blob upper.png
diff --git a/images/telegram_3536705 1.png b/images/telegram_3536705 1.png
diff --git a/images/twitter_5968830 1.png b/images/twitter_5968830 1.png
diff --git a/index.html b/index.html
@@ -1,111 +1,13 @@
-<<<<<<< HEAD
 <!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/assets/osdc logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>OSDC - open source developers community</title>
   </head>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
-=======
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>OSDC-open source developers community</title>
-    <link rel="stylesheet" href="style.css" />
-  </head>
-  <body>
-    <header>
-      <div class="header">
-        <div class="logo">
-          <img src="./images/osdc.png" alt="osdc logo" />
-        </div>
-        <div class="navbar">
-          <li>ABOUT</li>
-          <li>CONTACT</li>
-        </div>
-      </div>
-    </header>
-
-    <section class="logosection">
-      <div class="osdclogo">
-        <img src="./images/logo.png" alt="OSDC DESIGN" />
-        <div class="society">OPEN SOURCE DEVELOPERS COMMUNITY</div>
-        <div class="joindiscord">
-          <div class="invitition">Join our Discord Server</div>
-          <div class="button">
-            <div class="discordbutton">JODC Discord</div>
-          </div>
-        </div>
-      </div>
-    </section>
-
-    <section>
-      <div class="about">
-        <div class="div1">About OSDC</div>
-        <div class="div2">
-          We are an Open Source Community based in and around Jaypee Institute
-          of Information Technology, Noida, India. A community of web
-          developers, android freaks, machine learning enthusiasts, hackers,
-          designers, game developers and most significantly Explorers. We
-          welcome those who believe in the open source philosophy and are
-          willing to sacrifice their naps in order to change the world.
-        </div>
-        <div class="div3">
-          We also organize various workshops, talks and hackathons in an effort
-          towards encouraging more people to lean into the open source world! We
-          love having late night conversations on tech and building new things.
-          If you love the same just hop in, we are looking forward for your
-          participation.
-        </div>
-      </div>
-    </section>
-
-    <section class="findus">
-        <div class="socials">
-            <p>Find us on</p>
-            <div class="socialicons">
-                <img src="./images/discord_5968759 1.png"></img>
-                <img src="./images/github_3488425 1.png"></img>
-                <img src="./images/telegram_3536705 1.png"></img>
-                <img src="./images/twitter_5968830 1.png"></img>
-                <img src="./images/facebook_1051309 1.png"></img>
-            </div>
-        </div>
-    </section>
-
-    <section>
-        <div class="subscribe">
-            <div class="subscribe-message">Subscribe to our Newsletter</div>
-        <div class="emailinput">
-            <div class="bg">
-                <input class="email" type="email" placeholder="Drop your mail here...">
-                <label>Subscribe</label>
-            </div>
-        </div>
-        </div>
-    </section>
-
-    <div class="left-blob">
-        <img src="./images/left blob.png" alt="Left Blob Image">
-    </div>
-    <div class="right-upper-blob">
-        <img src="./images/right blob upper.png" alt="Right upper Blob Image">
-    </div>
-    <div class="right-lower-blob">
-        <img src="./images/right blob lower.png" alt="Right lower Blob Image">
-    </div>
-    <div class="bottom-left-blob">
-        <img src="./images/bottom left blob.png" alt="Bottom left Blob Image">
-    </div>
-    <div class="bottom-right-blob">
-        <img src="./images/bottom right blob.png" alt="Bottom right Blob Image">
-    </div>
->>>>>>> main
   </body>
 </html>