From 0e504061c44603d0d2aada2eeb7d2430300a2fb4 Mon Sep 17 00:00:00 2001
From: zakiaass <117088186+zakiaass@users.noreply.github.com>
Date: Sun, 17 Dec 2023 02:04:39 +0700
Subject: [PATCH] Update Style

---
 public/css/responsive.css      |  2 +-
 public/css/style.css           | 20 ++++++--
 resources/views/home.blade.php | 83 ++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/public/css/responsive.css b/public/css/responsive.css
index ba3a71e..e28f853 100644
--- a/public/css/responsive.css
+++ b/public/css/responsive.css
@@ -1,6 +1,6 @@
 @media (max-width: 1300px) {
   .footer_container {
-    border-radius: 250px 0 0 0;
+    border-radius: 100px 0 100px 0;
   }
 }
 
diff --git a/public/css/style.css b/public/css/style.css
index d11faf7..c629435 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -7,7 +7,7 @@ body {
 }
 
 .layout_padding {
-  padding: 90px 0;
+  padding: 30px 0;
 }
 
 .layout_margin {
@@ -249,7 +249,7 @@ .quote_btn-container .quote_btn {
   padding: 5px 25px;
   background-color: #f8842b;
   color: #ffffff;
-  border-radius: 5px;
+  border-radius: 15px;
   -webkit-transition: all 0.3s;
   transition: all 0.3s;
   border: 1px solid #f8842b;
@@ -262,6 +262,7 @@ .quote_btn-container .quote_btn:hover {
 }
 
 /*end header section*/
+
 /* slider section */
 .slider_section {
   -webkit-box-flex: 1;
@@ -319,7 +320,7 @@ .slider_section .detail-box .btn-box .btn1 {
   padding: 12px 15px;
   background-color: #0a0734;
   color: #ffffff;
-  border-radius: 5px;
+  border-radius: 15px;
   -webkit-transition: all 0.3s;
   transition: all 0.3s;
   border: 1px solid #0a0734;
@@ -373,8 +374,13 @@ .service_section .heading_container {
 
 .service_section .box {
   margin-top: 25px;
+<<<<<<< Updated upstream
   padding: 10px;
   border-radius: 10px;
+=======
+  padding: 15px;
+  border-radius: 20px;
+>>>>>>> Stashed changes
   -webkit-box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.25);
           box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.25);
   position: relative;
@@ -571,6 +577,7 @@ .swiper-slide {
   box-sizing: border-box;
 }
 
+<<<<<<< Updated upstream
 .client_section .box {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -728,12 +735,19 @@ .contact_section .map_container .map {
 .contact_section .map_container .map #googleMap {
   height: 100%;
 }
+=======
+/* Footer */
+>>>>>>> Stashed changes
 
 .footer_container {
   background-color: #0a0734;
   color: #ffffff;
+<<<<<<< Updated upstream
   border-radius: 100px 0 0 0;
   padding-top: 145px;
+=======
+  padding-top: 100px;
+>>>>>>> Stashed changes
 }
 
 /* info section */
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index b8044f2..1e4edfe 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -381,6 +381,11 @@
                     </div>
                 </div>
             </div>
+<<<<<<< Updated upstream
+=======
+          </div>
+          <!-- Tambahkan slide lainnya sesuai kebutuhan -->
+>>>>>>> Stashed changes
         </div>
     </section>
 
@@ -449,6 +454,80 @@
                     </div>
                 </div>
             </div>
+<<<<<<< Updated upstream
+=======
+          </div>
+          <div class="col-md-6 col-lg-2 mx-auto">
+            <div class="info_link_box">
+              <h4>
+                Links
+              </h4>
+              <div class="info_links">
+                <a class="" href="index.html">
+                  Home
+                </a>
+                <a class="" href="about.html">
+                  About
+                </a>
+                <a class="" href="service.html">
+                  Extracuricular
+                </a>
+              </div>
+            </div>
+          </div>
+          <div class="col-md-6 col-lg-3 ">
+            <h4>
+              Subscribe
+            </h4>
+            <form action="#">
+              <input type="text" placeholder="Enter email" />
+              <button type="submit">
+                Subscribe
+              </button>
+            </form>
+          </div>
+          <div class="col-md-6 col-lg-3 mb-0 ml-auto">
+            <div class="info_contact">
+              <h4>
+                Address
+              </h4>
+              <div class="contact_link_box">
+                <a href="">
+                  <i class="fa fa-map-marker" aria-hidden="true"></i>
+                  <span>
+                    Location
+                  </span>
+                </a>
+                <a href="">
+                  <i class="fa fa-phone" aria-hidden="true"></i>
+                  <span>
+                    Call +01 1234567890
+                  </span>
+                </a>
+                <a href="">
+                  <i class="fa fa-envelope" aria-hidden="true"></i>
+                  <span>
+                    demo@gmail.com
+                  </span>
+                </a>
+              </div>
+            </div>
+            <div class="info_social">
+              <a href="">
+                <i class="fa fa-facebook" aria-hidden="true"></i>
+              </a>
+              <a href="">
+                <i class="fa fa-twitter" aria-hidden="true"></i>
+              </a>
+              <a href="">
+                <i class="fa fa-linkedin" aria-hidden="true"></i>
+              </a>
+              <a href="">
+                <i class="fa fa-instagram" aria-hidden="true"></i>
+              </a>
+            </div>
+          </div>
+>>>>>>> Stashed changes
         </div>
     </section>
 
@@ -460,7 +539,11 @@
       <div class="container">
         <p>
           &copy; <span id="displayYear"></span> All Rights Reserved By
+<<<<<<< Updated upstream
           <a href="home">SIPEX</a>
+=======
+          <a href="">Free Html Templates</a>
+>>>>>>> Stashed changes
         </p>
       </div>
     </footer>