Update Model_Answer.html

SohamDeshmukh1 · SohamDeshmukh1 · commit c2dca5724a9e · 2024-03-18T13:11:44.000+05:30
diff --git a/departments/computer/I-Scheme/Model_Answer.html b/departments/computer/I-Scheme/Model_Answer.html
@@ -12,40 +12,6 @@
         integrity="sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+"
         crossorigin="anonymous"></script>
 
-    <style>
-        .container1 {
-            display: flex;
-            justify-content: space-between;
-            flex-wrap: wrap; /* Allow items to wrap to next line */
-        }
-
-        .card {
-            width: 30%;
-            margin-bottom:78px;
-            margin-top: -12%;
-            border: 1px solid #ccc;
-            border-radius: 8px;
-            overflow: hidden;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-        }
-
-        .heading {
-            font-size: 18px;
-            margin: 0;
-            text-align: center;
-        }
-
-        /* Media query for smaller screens */
-        @media (max-width: 720px) {
-            .container1 {
-                flex-direction: column; 
-            }
-
-            .card {
-                width: 80%
-            }
-        }
-    </style>
 </head>
 
 <body>
@@ -63,6 +29,7 @@ <h2>Model Answers</h2>
             </div>
         </div>
     </section>
+<<<<<<< HEAD
     <div class="card">
         <div class="card-header">
           Featured
@@ -77,19 +44,34 @@ <h5 class="card-title">Special title treatment</h5>
     </body>
     <script src="../../../loadfooter.js"></script>
     <!-- Include your footer and scripts -->
+=======
+    <div class="container-data">
+        <div class="card-data">
+            <div class="main-content">
+                <p class="heading">Different ways to use CSS in React</p>
+                <div class="categories">
+                    <span>React</span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../loadfooter.js"></script>
+</body>
+<!-- Include your footer and scripts -->
+>>>>>>> a790ca6f40f8877817d7af8f2ffb782b0ef7544a
+
+<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
+<script src="../../../vendor/jquery/jquery.min.js"></script>
+<script src="../../../vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="../../../assets/js/isotope.min.js"></script>
+<script src="../../../assets/js/owl-carousel.js"></script>
+<script src="../../../assets/js/lightbox.js"></script>
+<script src="../../../assets/js/tabs.js"></script>
+<script src="../../../assets/js/video.js"></script>
+<script src="../../../assets/js/slick-slider.js"></script>
+<script src="../../../assets/js/custom.js"></script>
 
-    <script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
-    <script src="../../../vendor/jquery/jquery.min.js"></script>
-    <script src="../../../vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-    <script src="../../../assets/js/isotope.min.js"></script>
-    <script src="../../../assets/js/owl-carousel.js"></script>
-    <script src="../../../assets/js/lightbox.js"></script>
-    <script src="../../../assets/js/tabs.js"></script>
-    <script src="../../../assets/js/video.js"></script>
-    <script src="../../../assets/js/slick-slider.js"></script>
-    <script src="../../../assets/js/custom.js"></script>
-   
-    <!-- This place i have called the footer -->
+<!-- This place i have called the footer -->
 
 
-</html>
+</html>
