From 412083e2aa16c6df167d036175dbd698f07520ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
 <xuhezhe@jikimo.com>
Date: Fri, 14 Jul 2023 10:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98logo=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/views/view.xml                           |  1 -
 spiffy_theme_backend/__manifest__.py                  |  4 ++--
 .../static/src/scss/activity_view.scss                | 11 +++++++++++
 spiffy_theme_backend/static/src/xml/menu.xml          |  1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/sf_warehouse/views/view.xml b/sf_warehouse/views/view.xml
index e9ef8467..ad353f0e 100644
--- a/sf_warehouse/views/view.xml
+++ b/sf_warehouse/views/view.xml
@@ -33,7 +33,6 @@
 <!--                        <field name="time_test" widget="timepicker"/>-->
                         <field name="area_type" attrs="{'invisible': [('hide_area', '=', False)], 'required': [('hide_area', '!=', False)]}"/>
 
-
                     </group>
                     <group>
                         <field name="storage_type" attrs="{'invisible': [('hide_area', '=', False)], 'required': [('hide_area', '!=', False)]}"/>
diff --git a/spiffy_theme_backend/__manifest__.py b/spiffy_theme_backend/__manifest__.py
index e3d61be9..2ffff0d3 100644
--- a/spiffy_theme_backend/__manifest__.py
+++ b/spiffy_theme_backend/__manifest__.py
@@ -7,7 +7,7 @@
     'version': '2.0',
     'author': 'Bizople Solutions Pvt. Ltd.',
     'website': 'https://www.bizople.com/',
-    'summary': 'The ultimate Odoo Backend theme with the most advanced key features of all time. Get your own personalized view while working on the Backend system with a wide range of choices. Spiffy theme has 3 in 1 Theme Style, Progressive Web App, Fully Responsive for all apps, Configurable Apps Icon, App Drawer with global search, RTL & Multi-Language Support, and many other key features.',
+    'summary': '机企猫定制的odoo主题',
     'description': """ The ultimate Odoo Backend theme with the most advanced key features of all time. Get your own personalized view while working on the Backend system with a wide range of choices. Spiffy theme has 3 in 1 Theme Style, Progressive Web App, Fully Responsive for all apps, Configurable Apps Icon, App Drawer with global search, RTL & Multi-Language Support, and many other key features. """,
     'depends': ['web', 'base_setup', 'portal', 'resource'],
     'data': [
@@ -24,7 +24,7 @@
         'views/res_config_setting.xml',
 
         'views/menuitems.xml',
-        
+
         'views/backend_configurator_template.xml',
         'views/login_page_style.xml',
         'views/templates_inherit.xml',
diff --git a/spiffy_theme_backend/static/src/scss/activity_view.scss b/spiffy_theme_backend/static/src/scss/activity_view.scss
index eb97db75..2462a613 100644
--- a/spiffy_theme_backend/static/src/scss/activity_view.scss
+++ b/spiffy_theme_backend/static/src/scss/activity_view.scss
@@ -69,5 +69,16 @@ body.o_web_client.top_menu_vertical .o_main_navbar .o_navbar_apps_menu .app_icon
 .jikimo {
     color: #fff;
     font-family: 'Berlin Sans FB';
+    margin-left: 8px;
     //font-weight: bold;
+    //margin-bottom: 0 !important;
+}
+
+.chn_title {
+    color: #fff;
+    margin-top: -10px;
+    font-size: 12px;
+    transform: scale(0.8);
+    letter-spacing: 5px;
+    margin-left: 6px;
 }
\ No newline at end of file
diff --git a/spiffy_theme_backend/static/src/xml/menu.xml b/spiffy_theme_backend/static/src/xml/menu.xml
index 31a80a0d..39dec6f1 100644
--- a/spiffy_theme_backend/static/src/xml/menu.xml
+++ b/spiffy_theme_backend/static/src/xml/menu.xml
@@ -155,6 +155,7 @@
 				<div class="o_company_logo">
 					<t t-if="currentCompany">
 						<h1 class="jikimo">JIKIMO</h1>
+						<div class="chn_title">机企猫</div>
 						<img class="img img-fluid company_logo_icon d-none" t-attf-src="/web/image?model=res.company&amp;field=backend_menubar_logo_icon&amp;id={{currentCompany.id}}"/>
 					</t>
 				</div>