Skip to content

Commit

Permalink
sync: master to develop
Browse files Browse the repository at this point in the history
sync: master to develop
  • Loading branch information
ovh-ux-cds authored Oct 10, 2024
2 parents 3abd855 + 391f719 commit 77defa1
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 608 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export const Datagrid = <T,>({
className,
onPaginationChange,
onSortChange,
contentAlignLeft,
contentAlignLeft = true,
hasNextPage,
onFetchNextPage,
manualSorting = true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { OsdsText } from '@ovhcloud/ods-components/react';
import {
ODS_THEME_COLOR_INTENT,
ODS_THEME_TYPOGRAPHY_LEVEL,
ODS_THEME_TYPOGRAPHY_SIZE,
} from '@ovhcloud/ods-common-theming';
import { useTranslation } from 'react-i18next';

Expand All @@ -16,11 +15,6 @@ export function DataGridTextCell({
return (
<OsdsText
level={ODS_THEME_TYPOGRAPHY_LEVEL.body}
size={
children
? ODS_THEME_TYPOGRAPHY_SIZE._600
: ODS_THEME_TYPOGRAPHY_SIZE._300
}
color={ODS_THEME_COLOR_INTENT.text}
className={className}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ export const BaseLayout = ({
{header && <Headers {...header} />}
{backLinkLabel && (onClickReturn || hrefPrevious) && (
<Links
className="mb-8"
className="mb-6"
onClickReturn={onClickReturn}
label={backLinkLabel}
type={LinkType.back}
target={OdsHTMLAnchorElementTarget._self}
href={hrefPrevious}
/>
)}
{description && <Description className="mb-8">{description}</Description>}
{message && <div className="mb-8">{message}</div>}
{description && <Description className="mb-6">{description}</Description>}
{message && <div className="mb-8 max-w-[800px]">{message}</div>}
{subtitle && <Subtitle className="block mb-6">{subtitle}</Subtitle>}
{subDescription && (
<Description className="mb-8">{subDescription}</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,12 @@ const dashboardTemplateProps = {
title: 'Vrack Services',
headerButton: <GuideButton items={guideItems} />,
},
subtitle: 'Lorem ipsum',
subtitle: '',
backLinkLabel: 'Retour à la XXX',
onClickReturn: () => {
console.log('back link click');
},
subdescription:
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed lacinia rutrum interdum. Nullam tempor, mi eu imperdiet scelerisque, lorem nisl blandit ligula, eget sodales erat nulla a odio. Donec efficitur posuere quam. Maecenas metus sem, venenatis id mattis eget, sollicitudin sit amet nulla. Sed ac erat fermentum, porta ligula ac,',
subdescription: '',
description:
'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
message: (
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ import { Meta } from '@storybook/addon-docs/blocks';

## Release Notes

> ### Version 1.36.0
>
> > #### Bugfixes
> >
> > - **datagrid component** Fix text cells and align left by default
> > - **Units test** Fix some problems of playwright import
> ### Version 1.35.1
>
> > #### What's news ?
> >
> > The repository is available is npm registry **[link](https://www.npmjs.com/package/@ovh-ux/manager-react-components)**
> ### Version 1.26.0
>
> > #### What's news ?
Expand Down
Loading

0 comments on commit 77defa1

Please sign in to comment.