Merge branch 'stable/2024.2'

config/webpack.common.js

@@ -82,10 +82,7 @@ module.exports = {
             },
           },
         ],
-        include: [
-          root('src/asset/image/cloud-logo.svg'),
-          root('src/asset/image/cloud-logo-white.svg'),
-        ],
+        include: [root('src/asset/image/FelCloud_website_white-07-01.png')],
       },
       {
         test: /\.(woff|woff2|ttf|eot|svg)$/,

src/components/Layout/GlobalHeader/index.jsx

@@ -14,8 +14,8 @@
 
 import React from 'react';
 import { Link } from 'react-router-dom';
-import cloudLogo from 'asset/image/cloud-logo.svg';
-import cloudLogoWhite from 'asset/image/cloud-logo-white.svg';
+
+import cloudLogo from 'asset/image/FelCloud_website_white-07-01.png';
 import { getPath } from 'utils/route-map';
 import classnames from 'classnames';
 import GlobalNav from '../GlobalNav';
@@ -37,11 +37,12 @@ export default function HeaderContent(props) {
   const renderLogo = () => {
     const homeUrl = getRoutePath('overview');
     const logoSrc =
-      GLOBAL_VARIABLES.skylineThemeName === 'default'
-        ? cloudLogo
-        : cloudLogoWhite;
+      GLOBAL_VARIABLES.skylineThemeName === 'default' ? cloudLogo : cloudLogo;
     return (
-      <div className={classnames(styles.logo)}>
+      <div
+        className={classnames(styles.logo)}
+        style={{ backgroundColor: '#26262B' }}
+      >
         <Link to={homeUrl}>
           <img src={logoSrc} alt="logo" className={styles['logo-image']} />
         </Link>

src/layouts/Auth/index.jsx

@@ -17,9 +17,8 @@ import { inject, observer } from 'mobx-react';
 import renderRoutes from 'utils/RouterConfig';
 import SelectLang from 'components/SelectLang';
 
-import logo from 'asset/image/logo.png';
+import logo from 'asset/image/FelCloud_website_white-07-01.png';
 import loginFullImage from 'asset/image/login-full.png';
-import loginRightLogo from 'asset/image/loginRightLogo.png';
 import styles from './index.less';
 
 export class AuthLayout extends Component {
@@ -39,9 +38,10 @@ export class AuthLayout extends Component {
         />
         <div className={styles['full-image-front']} />
         <img
-          src={loginRightLogo}
+          src={logo}
           alt=""
           className={styles['login-right-logo']}
+          style={{ maxWidth: '200px' }}
         />
       </div>
     );
@@ -56,7 +56,10 @@ export class AuthLayout extends Component {
           </div>
           <div className={styles.main}>
             <div className={styles.top}>
-              <div className={styles.header}>
+              <div
+                className={styles.header}
+                style={{ backgroundColor: '#26262b;', width: 'fit-content' }}
+              >
                 <img alt="logo" className={styles.logo} src={logo} />
               </div>
             </div>