feat(container): merge with ods feedback and new icons

ref: MANAGER-14461 Signed-off-by: Maxime Bajeux <[email protected]>
ovh · Dec 17, 2024 · 7271c21 · 7271c21
1 parent 760fdd7
commit 7271c21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/SidebarLink.tsx b/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/SidebarLink.tsx
@@ -5,7 +5,10 @@ import SidebarLinkTag from './SidebarLinkTag';
 import { Node } from './navigation-tree/node';
 import StaticLink from '@/container/nav-reshuffle/sidebar/StaticLink';
 import { OsdsIcon } from '@ovhcloud/ods-components/react';
-import { ODS_ICON_NAME, ODS_ICON_SIZE } from '@ovhcloud/ods-components';
+import {
+  ODS_ICON_NAME,
+  ODS_ICON_SIZE,
+} from '@ovhcloud/ods-components';
 import { SvgIconWrapper } from '@ovh-ux/ovh-product-icons/utils/SvgIconWrapper';
 
 export type SidebarLinkProps = {
@@ -22,8 +25,8 @@ const SidebarLink: React.FC<ComponentProps<SidebarLinkProps>> = ({
   count = 0,
   node = {},
   linkParams = {},
-  handleOnClick = () => {},
-  handleOnEnter = () => {},
+  handleOnClick = () => { },
+  handleOnEnter = () => { },
   id = '',
   isShortText = false,
 }: SidebarLinkProps): JSX.Element => {
@@ -55,16 +58,9 @@ const SidebarLink: React.FC<ComponentProps<SidebarLinkProps>> = ({
       data-testid={id}
       role="button"
     >
-      <span className="flex gap-2 align-items-center justify-start">
-        <span className={style.button_as_div_icon}>
-          <SvgIconWrapper
-            name={node.svgIcon}
-            height={32}
-            width={32}
-            className="p-1 fill-white block"
-          />
-        </span>
-        <span className={style.button_as_div_text}>{t(node.translation)}</span>
+      <span className='flex gap-2 align-items-center'>
+        <SvgIconWrapper name={node.svgIcon} height={32} width={32} className='p-1 fill-white block' />
+        {!isShortText && <span>{t(node.translation)}</span>}
       </span>
       <span className="flex justify-end align-items-center">
         {(count as number) > 0 && (
@@ -86,4 +82,4 @@ const SidebarLink: React.FC<ComponentProps<SidebarLinkProps>> = ({
   );
 };
 
-export default SidebarLink;
+export default SidebarLink;
diff --git a/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/style.module.scss b/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/style.module.scss
@@ -340,10 +340,6 @@ $sidebar-font-size: 0.875rem;
     white-space: nowrap;
   }
 
-  &_icon {
-    height: 0;
-  }
-
   &_text, &_short &_icon {
     transition: opacity 0.1s ease-in 0.2s;
     opacity: 1;