From 7008d8f2b1ed650cc58b6653d8eb65a7db739241 Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Sat, 14 Dec 2024 00:31:07 +0800
Subject: [PATCH] opt ee style

---
 app_web_enterprise/__manifest__.py            |  5 ++-
 .../static/src/scss/app_style_before.scss     | 11 +++---
 .../static/src/scss/home_menu.variables.scss  | 11 ++++++
 .../static/src/scss/home_menu_background.scss | 11 ------
 .../static/src/scss/navbar.scss               | 36 +++++++++++++++++++
 .../static/src/scss/navbar.variables.scss     | 15 ++++++++
 6 files changed, 71 insertions(+), 18 deletions(-)
 create mode 100644 app_web_enterprise/static/src/scss/home_menu.variables.scss
 delete mode 100644 app_web_enterprise/static/src/scss/home_menu_background.scss
 create mode 100644 app_web_enterprise/static/src/scss/navbar.scss
 create mode 100644 app_web_enterprise/static/src/scss/navbar.variables.scss

diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py
index 69fafb0c..94d46dc6 100644
--- a/app_web_enterprise/__manifest__.py
+++ b/app_web_enterprise/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': "odoo18 Enterprise enhance Pack,企业版界面及操作增强",
-    'version': '18.0.24.08.20',
+    'version': '18.0.24.12.14',
     'author': 'odooai.cn',
     'category': 'Extra tools',
     'website': 'https://www.odooai.cn',
@@ -74,8 +74,11 @@
             ('before', 'web_enterprise/static/src/scss/primary_variables.scss', 'app_web_enterprise/static/src/scss/primary_variables.scss'),
         ],
         'web.assets_backend': [
+            ('before', 'web_enterprise/static/src/webclient/home_menu/home_menu.variables.scss', 'app_web_enterprise/static/src/scss/home_menu.variables.scss'),
             ('before', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/app_style_before.scss'),
             ('after', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/app_style_after.scss'),
+            ('after', 'web_enterprise/static/src/webclient/navbar/navbar.variables.scss', 'app_web_enterprise/static/src/scss/navbar.variables.scss'),
+            ('after', 'web_enterprise/static/src/webclient/navbar/navbar.scss', 'app_web_enterprise/static/src/scss/navbar.scss'),
             'app_web_enterprise/static/src/webclient/**/*.xml',
             'app_web_enterprise/static/src/xml/res_config_edition.xml',
             # 'app_web_enterprise/static/src/xml/form.xml',
diff --git a/app_web_enterprise/static/src/scss/app_style_before.scss b/app_web_enterprise/static/src/scss/app_style_before.scss
index 62a0ab1d..456b862f 100644
--- a/app_web_enterprise/static/src/scss/app_style_before.scss
+++ b/app_web_enterprise/static/src/scss/app_style_before.scss
@@ -1,9 +1,8 @@
-//navbar
-$o-navbar-background: rgba($o-brand-odoo, .06);
-
-.o_main_navbar {
-  --NavBar-entry-backgroundColor: $o-navbar-background;
-  background: $o-navbar-background;
+//字体大小
+.o_web_client {
+  .o_home_menu {
+    font-size: $o-home-menu-font-size-base;
+  }
 }
 //navbar 的下拉箭头
 //在顶部
diff --git a/app_web_enterprise/static/src/scss/home_menu.variables.scss b/app_web_enterprise/static/src/scss/home_menu.variables.scss
new file mode 100644
index 00000000..cb198d7b
--- /dev/null
+++ b/app_web_enterprise/static/src/scss/home_menu.variables.scss
@@ -0,0 +1,11 @@
+$o-home-menu-font-size-base: 1.2rem;
+$o-home-menu-caption-color: $o-gray-200 !default;
+$o-home-menu-caption-shadow: none !default;
+
+$o-home-menu-custom-caption-color: #fff !default;
+$o-home-menu-custom-caption-shadow: 0 1px 2px rgba(255, 255, 255, .55), 0 2px 5px rgba(0, 0, 0, .05), 0 0 5px rgba(0, 0, 0, .05) !default;
+
+.o_home_menu_background, .o_web_client.o_home_menu_background {
+  --homeMenu-bg-color: rgba(#{to-rgb($o-brand-odoo)}, .8);
+  --homeMenu-bg-image: url("/app_web_enterprise/static/src/img/home-menu-bg-overlay.svg");
+}
\ No newline at end of file
diff --git a/app_web_enterprise/static/src/scss/home_menu_background.scss b/app_web_enterprise/static/src/scss/home_menu_background.scss
deleted file mode 100644
index b23dff7f..00000000
--- a/app_web_enterprise/static/src/scss/home_menu_background.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.o_home_menu_background, .o_web_client.o_home_menu_background {
-    background: {
-        size: cover;
-        attachment: fixed;
-        color: var(--homeMenu-bg-color, #00463e);
-        image: var(--homeMenu-bg-image,
-            linear-gradient(to right bottom, #00796B, #00463e),
-            url("/app_web_enterprise/static/src/img/home-menu-bg-overlay.svg")
-        );
-    }
-}
diff --git a/app_web_enterprise/static/src/scss/navbar.scss b/app_web_enterprise/static/src/scss/navbar.scss
new file mode 100644
index 00000000..da64f742
--- /dev/null
+++ b/app_web_enterprise/static/src/scss/navbar.scss
@@ -0,0 +1,36 @@
+//自定义的navbar
+.o_web_client {
+  .o_main_navbar {
+    --NavBar-entry-color: #{$o-navbar-entry-color};
+    --NavBar-entry-color--hover: #{$o-navbar-entry-color--hover};
+    --NavBar-entry-color--active: #{$o-navbar-entry-color--active};
+
+    --NavBar-entry-borderColor-active: #{$o-navbar-entry-bg--active};
+
+    --NavBar-entry-backgroundColor: #{$o-navbar-background};
+    --NavBar-entry-backgroundColor--hover: #{$o-navbar-entry-bg--hover};
+    --NavBar-entry-backgroundColor--active: #{$o-navbar-entry-bg--active};
+    --NavBar-entry-backgroundColor--focus: #{$o-navbar-entry-bg--hover};
+    --NavBar-brand-color: #{$o-navbar-brand-color};
+
+    background: var(--NavBar-entry-backgroundColor, #{$o-navbar-background});
+
+    .o_menu_sections {
+      .o_nav_entry, .dropdown-toggle {
+        background: transparent;
+
+        &:hover {
+          background: var(--NavBar-entry-backgroundColor--hover, #{$o-navbar-entry-bg--hover});
+        }
+
+        &:focus {
+          background: var(--NavBar-entry-backgroundColor--focus, #{$o-navbar-entry-bg--hover});
+        }
+
+        &:active {
+          background: var(--NavBar-entry-backgroundColor--active, #{$o-navbar-entry-bg--active});
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app_web_enterprise/static/src/scss/navbar.variables.scss b/app_web_enterprise/static/src/scss/navbar.variables.scss
new file mode 100644
index 00000000..4d9706aa
--- /dev/null
+++ b/app_web_enterprise/static/src/scss/navbar.variables.scss
@@ -0,0 +1,15 @@
+//自定义的navbar
+$o-navbar-background: rgba($o-brand-odoo, .8);
+$o-navbar-entry-color: $o-gray-200 ;
+
+$o-navbar-entry-bg--hover: rgba($o-brand-odoo, 9);
+$o-navbar-entry-color--hover: $o-gray-200 ;
+
+$o-navbar-entry-bg--active: rgba($o-brand-odoo, .9) ;
+$o-navbar-entry-color--active: $o-gray-100 ;
+
+$o-navbar-brand-color: $o-gray-100 ;
+
+$o-navbar-entry-color: rgba($o-white, .9);
+$o-navbar-entry-color--hover: $o-white;
+