diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index c7482124..0bdefba0 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo18 Tweak,Ai Employee,Boost,Customize All in One. Customize,UI,Boost,Security,Data,Development Enhance', - 'version': '18.0.24.11.13', + 'version': '18.0.24.12.16', 'author': 'odooai.cn', 'category': 'Extra Tools', 'website': 'https://www.odooai.cn', diff --git a/app_odoo_customize/i18n/zh_CN.po b/app_odoo_customize/i18n/zh_CN.po index 80ed88b9..4470ca21 100644 --- a/app_odoo_customize/i18n/zh_CN.po +++ b/app_odoo_customize/i18n/zh_CN.po @@ -94,7 +94,7 @@ msgstr " 模块 " #. module: app_odoo_customize #: model_terms:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings msgid "Set to False to hide" -msgstr "设置为 False 则不显示" +msgstr "设置为 False 或 0 则不显示" #. module: app_odoo_customize #. odoo-javascript diff --git a/app_odoo_customize/static/src/js/ribbon.js b/app_odoo_customize/static/src/js/ribbon.js index 5d520714..c57537f1 100644 --- a/app_odoo_customize/static/src/js/ribbon.js +++ b/app_odoo_customize/static/src/js/ribbon.js @@ -49,7 +49,7 @@ export class WebEnvironmentRibbon extends Component { .call("web.environment.ribbon.backend", "get_environment_ribbon") .then(function (ribbon_data) { // Ribbon name - if (ribbon_data.name && ribbon_data.name !== "False") { + if (ribbon_data.name && ribbon_data.name !== "False" && ribbon_data.name !== "0") { ribbon.classList.remove('o_hidden'); ribbon.innerHTML = ribbon_data.name; } diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py index 76e9ba66..a5ec223e 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.12.14', + 'version': '18.0.24.12.16', 'author': 'odooai.cn', 'category': 'Extra tools', 'website': 'https://www.odooai.cn', diff --git a/app_web_enterprise/static/src/scss/home_menu.variables.scss b/app_web_enterprise/static/src/scss/home_menu.variables.scss index 9fa5642d..9f93ad9c 100644 --- a/app_web_enterprise/static/src/scss/home_menu.variables.scss +++ b/app_web_enterprise/static/src/scss/home_menu.variables.scss @@ -1,12 +1,12 @@ $o-home-menu-font-size-base: 1.2rem; -$o-home-menu-caption-color: $o-gray-200 !default; +$o-home-menu-caption-color: #fff !default; $o-home-menu-caption-shadow: none !default; -$o-home-menu-custom-caption-color: #fff !default; +$o-home-menu-custom-caption-color: $o-gray-100 !default; $o-home-menu-custom-caption-shadow: 0 1px 2px rgba(255, 255, 255, .15), 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-color: rgba(#{to-rgb($o-action)}, .9); --homeMenu-bg-image: url("/app_web_enterprise/static/src/img/home-menu-bg-overlay.svg"); .o_app .o_app_icon { diff --git a/app_web_enterprise/static/src/scss/navbar.variables.scss b/app_web_enterprise/static/src/scss/navbar.variables.scss index 7a8f80a9..7f31e1e3 100644 --- a/app_web_enterprise/static/src/scss/navbar.variables.scss +++ b/app_web_enterprise/static/src/scss/navbar.variables.scss @@ -1,5 +1,4 @@ //自定义的navbar -$o-navbar-background: rgba($o-brand-odoo, .9); $o-navbar-entry-color: $o-form-lightsecondary; $o-navbar-entry-bg--hover: transparent; @@ -10,4 +9,5 @@ $o-navbar-entry-color--active: $o-brand-lightsecondary ; $o-navbar-brand-color: $o-brand-lightsecondary; +$o-navbar-background: linear-gradient(45deg, #{$o-brand-odoo}, #{$o-action}); diff --git a/app_web_enterprise/static/src/scss/primary_variables.scss b/app_web_enterprise/static/src/scss/primary_variables.scss index 6b68e7e4..0a41d51c 100644 --- a/app_web_enterprise/static/src/scss/primary_variables.scss +++ b/app_web_enterprise/static/src/scss/primary_variables.scss @@ -1,2 +1,16 @@ -$o-brand-odoo: #00796B !default; +$o-white: #FFF !default; +$o-enterprise-color: #00796B !default; +$o-enterprise-action-color: #09554c !default; + +$o-opacity-disabled: .5 !default; +$o-opacity-muted: .76 !default; + +$o-brand-odoo: $o-enterprise-color !default; $o-brand-primary: $o-brand-odoo !default; + +$o-action: $o-enterprise-action-color !default; + +// Components +$o-component-active-bg: mix($o-action, $o-white, 10%) !default; +$o-component-active-border: $o-action !default; +$o-view-background-color: #fbfbfb !default;