From c2f859d1a95424dd135ae75ce984432a484a40f7 Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Fri, 26 May 2023 21:29:41 +0800
Subject: [PATCH] =?UTF-8?q?opt=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_odoo_customize/static/src/scss/app.scss   | 16 ++++++++----
 .../static/src/webclient/webclient.xml        | 25 ++++++++++---------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app_odoo_customize/static/src/scss/app.scss b/app_odoo_customize/static/src/scss/app.scss
index 9a4bdaa9..b0fd10b9 100644
--- a/app_odoo_customize/static/src/scss/app.scss
+++ b/app_odoo_customize/static/src/scss/app.scss
@@ -19,11 +19,19 @@
 }
 // navbar在下方的特殊处理
 .o_web_client.navbar_pos_bottom {
-  --o-navbar-height: 60px;
+
+  @media (max-width: 768px) {
+    --o-navbar-height: 60px;
+  }
+  flex-direction: column-reverse!important;
   .o_navbar {
     display: block;
-    .o_main_navbar  {
-      --o-navbar-height: 60px;
+
+    .o_main_navbar {
+      @media (max-width: 768px) {
+        --o-navbar-height: 60px;
+        padding: 0 40px;
+      }
       button.o_mobile_menu_toggle, .o_menu_systray .o_debug_manager .dropdown-toggle  {
         font-size: 1.5em;
       }
@@ -47,8 +55,6 @@
   //homeMenu
   .o_home_menu {
     .container, .o_container_small, .container-fluid, .container-xxl, .container-xl, .container-lg, .container-md, .container-sm  {
-      position: absolute;
-      bottom: var(--o-navbar-height);
       //bottom: 60px;
     }
   }
diff --git a/app_odoo_customize/static/src/webclient/webclient.xml b/app_odoo_customize/static/src/webclient/webclient.xml
index 1b165a55..1e420596 100644
--- a/app_odoo_customize/static/src/webclient/webclient.xml
+++ b/app_odoo_customize/static/src/webclient/webclient.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 <!--        移动端nav在下方，可配置处理-->
-	<t t-name="app_web_enterprise.WebClient" t-inherit="web.WebClient" t-inherit-mode="extension">
-        <xpath expr="//t/t" position="attributes">
-            <attribute name="t-if">
-                !state.fullscreen and state.navbar_pos!='bottom'
-            </attribute>
-        </xpath>
-		<xpath expr="//MainComponentsContainer" position="after">
-	        <t t-if="!state.fullscreen and state.navbar_pos=='bottom'">
-	            <NavBar/>
-	        </t>
+<!--	调整为 css flex处理，不改xml-->
+<!--	<t t-name="app_web_enterprise.WebClient" t-inherit="web.WebClient" t-inherit-mode="extension">-->
+<!--        <xpath expr="//t/t" position="attributes">-->
+<!--            <attribute name="t-if">-->
+<!--                !state.fullscreen and state.navbar_pos!='bottom'-->
+<!--            </attribute>-->
+<!--        </xpath>-->
+<!--		<xpath expr="//MainComponentsContainer" position="after">-->
+<!--	        <t t-if="!state.fullscreen and state.navbar_pos=='bottom'">-->
+<!--	            <NavBar/>-->
+<!--	        </t>-->
 <!--			<div class="row" style="height:200px">-->
 <!--				增加Debug pad-->
 <!--			</div>-->
-        </xpath>
-    </t>
+<!--        </xpath>-->
+<!--    </t>-->
 
 </templates>