From cc3cb2f7a858a280a3c9cdc735f6fa8bc2a965f4 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Wed, 12 Mar 2025 15:38:29 +0800
Subject: [PATCH] [system admin, org admin] departments: modified UI details
 for the 'New Department' button (#7594)

---
 .../css/{system-departments-v2.css => system-departments.css}   | 2 ++
 .../src/pages/org-admin/departments/departments-tree-panel.js   | 2 +-
 frontend/src/pages/org-admin/departments/departments.js         | 2 +-
 .../src/pages/sys-admin/departments/departments-tree-panel.js   | 2 +-
 frontend/src/pages/sys-admin/departments/departments.js         | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename frontend/src/css/{system-departments-v2.css => system-departments.css} (97%)

diff --git a/frontend/src/css/system-departments-v2.css b/frontend/src/css/system-departments.css
similarity index 97%
rename from frontend/src/css/system-departments-v2.css
rename to frontend/src/css/system-departments.css
index eb5f32950c..74fbd92d07 100644
--- a/frontend/src/css/system-departments-v2.css
+++ b/frontend/src/css/system-departments.css
@@ -85,11 +85,13 @@
 
 .departments-tree-panel .new-dept-btn {
   padding: 0 6px;
+  margin-top: 10px;
 }
 
 .departments-tree-panel .new-dept-btn-icon {
   font-size: 1rem;
   color: #666;
+  margin-right: 2px;
 }
 
 .department-content-main {
diff --git a/frontend/src/pages/org-admin/departments/departments-tree-panel.js b/frontend/src/pages/org-admin/departments/departments-tree-panel.js
index 060c2ac7a8..2de8ee9b78 100644
--- a/frontend/src/pages/org-admin/departments/departments-tree-panel.js
+++ b/frontend/src/pages/org-admin/departments/departments-tree-panel.js
@@ -40,7 +40,7 @@ class DepartmentsTreePanel extends Component {
           className='btn btn-secondary btn-block text-left border-0 font-weight-normal new-dept-btn shadow-none'
           onClick={() => {this.props.toggleAddDepartment(null);}}
         >
-          <i className="sf3-font sf3-font-new mr-2 new-dept-btn-icon"></i>
+          <i className="sf3-font sf3-font-new new-dept-btn-icon"></i>
           {gettext('New Department')}
         </button>
       </div>
diff --git a/frontend/src/pages/org-admin/departments/departments.js b/frontend/src/pages/org-admin/departments/departments.js
index 5dccb308c1..30978e4194 100644
--- a/frontend/src/pages/org-admin/departments/departments.js
+++ b/frontend/src/pages/org-admin/departments/departments.js
@@ -15,7 +15,7 @@ import DepartmentsTreePanel from './departments-tree-panel';
 import Department from './department';
 import MainPanelTopbar from '../main-panel-topbar';
 
-import '../../../css/system-departments-v2.css';
+import '../../../css/system-departments.css';
 
 class Departments extends React.Component {
 
diff --git a/frontend/src/pages/sys-admin/departments/departments-tree-panel.js b/frontend/src/pages/sys-admin/departments/departments-tree-panel.js
index bd4eb7b275..38394afcb6 100644
--- a/frontend/src/pages/sys-admin/departments/departments-tree-panel.js
+++ b/frontend/src/pages/sys-admin/departments/departments-tree-panel.js
@@ -40,7 +40,7 @@ class DepartmentsTreePanel extends Component {
           className='btn btn-secondary btn-block text-left border-0 font-weight-normal new-dept-btn shadow-none'
           onClick={() => {this.props.toggleAddDepartment(null);}}
         >
-          <i className="sf3-font sf3-font-new mr-2 new-dept-btn-icon"></i>
+          <i className="sf3-font sf3-font-new new-dept-btn-icon"></i>
           {gettext('New Department')}
         </button>
       </div>
diff --git a/frontend/src/pages/sys-admin/departments/departments.js b/frontend/src/pages/sys-admin/departments/departments.js
index ad33581872..81ea27a2dd 100644
--- a/frontend/src/pages/sys-admin/departments/departments.js
+++ b/frontend/src/pages/sys-admin/departments/departments.js
@@ -15,7 +15,7 @@ import DepartmentsTreePanel from './departments-tree-panel';
 import Department from './department';
 import MainPanelTopbar from '../main-panel-topbar';
 
-import '../../../css/system-departments-v2.css';
+import '../../../css/system-departments.css';
 
 class Departments extends React.Component {