From d467ff0fe05c94addd77d283337888819d82e2b6 Mon Sep 17 00:00:00 2001
From: Tieptk <tieptk@hurasoft.com>
Date: Mon, 8 Jan 2024 10:46:14 +0700
Subject: [PATCH] 10;46 8/1/2024

---
 homepage.html      | 4 ++--
 product_list.html  | 5 -----
 them_san_pham.html | 4 ----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/homepage.html b/homepage.html
index e1624ba..fc50794 100644
--- a/homepage.html
+++ b/homepage.html
@@ -21,7 +21,7 @@
     <div class="admin-global-container">
 
         <!-- Menu cũ  -->
-        <div class="admin-menu-container sticky top-0 bottom-0 h-[100vh] flex">
+        <div class="admin-menu-container sticky top-0 bottom-0 h-[100vh] hidden">
             <a href="" class="menu-logo">
                 <img src="images/logo.png" />
             </a>
@@ -400,7 +400,7 @@
             </div>
         </div>
 
-        <div class="admin-content-container">
+        <div class="admin-content-container w-[100%]">
             <!-- Header -->
             <div class="admin-header-container flex items-center justify-between bg-white px-4 py-3">
                 <form class="max-w-[420px] relative w-[100%]">
diff --git a/product_list.html b/product_list.html
index a911c07..9264b65 100644
--- a/product_list.html
+++ b/product_list.html
@@ -778,11 +778,6 @@
 
         </div>
         <!-- end -->
-
-<<<<<<< HEAD
-
-=======
->>>>>>> tieptk
     </div>
     <!-- Script -->
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>
diff --git a/them_san_pham.html b/them_san_pham.html
index e55c3d4..6ac29e6 100644
--- a/them_san_pham.html
+++ b/them_san_pham.html
@@ -759,10 +759,6 @@
         </div>
 
     </div>
-<<<<<<< HEAD
-=======
-    <!-- end -->
->>>>>>> tieptk
 
     <!-- Script -->
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>