10;46 8/1/2024

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%]">

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>

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>