uploading assignment 2

AniketM156 · Jul 9, 2022 · f343f7e · f343f7e
1 parent c503af5
commit f343f7e
Show file tree

Hide file tree

Showing 3 changed files with 165 additions and 13 deletions.
diff --git a/module2_soln/css/style.css b/module2_soln/css/style.css
@@ -0,0 +1,126 @@
+*{
+    box-sizing: border-box;
+    font-family:"Comic Sans MS", cursive, sans-serif;
+}
+.row{
+    width :100%;
+}
+h1{
+    font-size: 2em;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom:30px;
+}
+
+#container{
+    position: relative;
+    text-align: left;
+    padding-top: 9%;
+    padding-left: 3%;;
+    padding-bottom: 3%;
+    padding-right: 3%;
+    border: 4px solid black;
+    background-color: gray;
+    margin-left: 5%;
+    margin-bottom: 5%;
+    height: 200px;
+    overflow:auto ;
+}
+#container3{
+  position: relative;
+  text-align: left;
+  padding-top: 8%;
+  padding-left: 3%;;
+  padding-bottom: 3%;
+  padding-right: 3%;
+  border: 4px solid black;
+  background-color: gray;
+  margin-left: 5%;
+  margin-bottom: 5%;
+  height: 200px;
+  overflow:auto ;
+}
+
+#para_heading{
+  text-size-adjust: 150%;
+  padding:2px;
+  text-align: center;
+  border-left: 4px solid black;
+  border-bottom: 4px solid black;
+  position:absolute;
+  top: 0%;
+  left:70%;
+  width:30%;
+  height:20%;
+  margin :0px;
+}
+#para_heading.cheiken_heading{
+  background-color: pink;
+}
+#para_heading.beef_heading{
+  background-color:red;
+}
+#para_heading.sushi_heading{
+  background-color: yellow;
+}
+/********** Large devices only **********/
+@media (min-width: 992px) {
+    .col-lg-3,.col-lg-4,.col-lg-6,.col-lg-12{
+     float : left;
+    }
+      .col-lg-3 {
+        width: 25%;
+      }
+      .col-lg-4 {
+        width: 33.33%;
+      }
+      .col-lg-6 {
+        width: 50%;
+      }
+      .col-lg-12 {
+        width: 100%;
+      }
+
+  }
+
+  /********** Medium devices only **********/
+  @media (min-width: 768px) and (max-width: 991px) {
+    .col-md-3, .col-md-4,.col-md-6,.col-md-12 {
+        float :left;
+      }
+      .col-md-3 {
+        width: 25%;
+      }
+      .col-md-4 {
+        width: 33.33%;
+      }
+      .col-md-6 {
+        width: 50%;
+      }
+      .col-md-12 {
+        width: 100%;
+      }
+      #container3{
+        /* margin-right: 100px; */
+        width: 195%;
+      }
+  }
+
+  /********** Small devices only **********/
+  @media (max-width: 767px) {
+    .col-s-3, .col-s-4,.col-s-6,.col-s-12 {
+        float: left;
+      }
+      .col-s-3 {
+        width: 25%;
+      }
+      .col-s-4 {
+        width: 33.33%;
+      }
+      .col-s-6 {
+        width: 50%;
+      }
+      .col-s-12 {
+        width: 100%;
+      }
+  }
diff --git a/module2_soln/index.html b/module2_soln/index.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Assignment solution for module 2</title>
+    <link rel = "stylesheet" href = "css/style.css">
+</head>
+<body>
+    <h1>Our Menu</h1>
+    <div class = "row">
+        <div class = "col-lg-4 col-md-6 col-s-12">
+            <div id ="container"><p id = "para_heading" class="cheiken_heading">Chiken</p>
+            Lorem ipsum dolor sit amet consectetur adipisicing elit. Repudiandae,
+             voluptate veniam? Illum exercitationem rem quidem voluptatibus iste 
+             cumque unde. Asperiores soluta doloremque numquam laborum error laudantium
+            </div>
+        </div>
+        <div  class = "col-lg-4 col-md-6 col-s-12">
+            <div id ="container"><p id = "para_heading" class="beef_heading">Beef</p>
+                Lorem, ipsum dolor sit amet consectetur adipisicing elit. 
+                Modi, dolorum! Magni omnis ullam error quis architecto repellendus ipsum, 
+                officia quibusdam consectetur, distinctio blanditiis sint est incidunt facere 
+                reprehenderit voluptas doloribus!</div>
+        </div>
+        <div class = "col-lg-4 col-md-6 col-s-12">
+            <div id ="container3"><p id = "para_heading" class="sushi_heading">Sushi</p>
+                Lorem ipsum dolor sit amet consectetur adipisicing elit. 
+                Amet cum eum perspiciatis non omnis vel. Ipsam quam accusantium 
+                odit cumque consectetur itaque explicabo facilis quibusdam sint sunt, 
+                assumenda sequi eum?</div>
+        </div>
+    </div>
+    <div id ></div>
+</body>
+</html>
diff --git a/site/index.html b/site/index.html
@@ -1,21 +1,10 @@
-<<<<<<< HEAD
 <!DOCTYPE html>
 <html>
 <head>
     <title>Hello World</title>
 </head>
 <body>
     <h1>Namaste world</h1>
-    <marque>Namaste webpage</marque>
+    <h3>Are these chanegs being implim</h3>
 </body>
-=======
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Hello World</title>
-</head>
-<body>
-    <h1>Namaste world</h1>
-</body>
->>>>>>> 66258c4da921bfa86db4003341ac71e2f168a344
-</html>
+<html>