Skip to content

Commit

Permalink
Merge pull request #243 from PrestaShop/develop
Browse files Browse the repository at this point in the history
Release v2.0.3
  • Loading branch information
jolelievre authored Oct 4, 2024
2 parents f1e317b + 5d96aa1 commit 21c0f94
Show file tree
Hide file tree
Showing 28 changed files with 1,892 additions and 744 deletions.
4 changes: 4 additions & 0 deletions .storybook/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ body {
.os-host {
color: red;
}

.prismjs {
color: white;
}
2,576 changes: 1,859 additions & 717 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prestakit",
"version": "2.0.2",
"version": "2.0.3",
"description": "Prestashop UI Kit integration",
"repository": {
"type": "git",
Expand Down Expand Up @@ -37,13 +37,15 @@
"@babel/cli": "^7.0.0",
"@babel/core": "^7.12.3",
"@babel/preset-env": "^7.12.1",
"@mdx-js/react": "^2.1.3",
"@mdx-js/react": "^1.6.22",
"@storybook/addon-a11y": "^6.5.12",
"@storybook/addon-docs": "^6.5.12",
"@storybook/addon-essentials": "^6.5.12",
"@storybook/addon-links": "^6.5.12",
"@storybook/builder-webpack5": "^6.5.12",
"@storybook/html": "^6.5.12",
"@storybook/manager-webpack5": "^6.5.12",
"@storybook/react": "^6.5.12",
"@storybook/theming": "^6.5.12",
"babel-loader": "^8.1.0",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
Expand Down
2 changes: 1 addition & 1 deletion stories/html/alerts/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import basicsContent from './basics.html'
import expandableContent from './expandable.html'

Expand Down
2 changes: 1 addition & 1 deletion stories/html/badges/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import badgesContent from './badges.html'

<Meta title="Badges" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/breadcrumb/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import breadcrumbContent from './breadcrumb.html'

<Meta title="Breadcrumb" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/buttons/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import toolbarContent from './toolbar.html'
import basicsContent from './basics.html'
import outlineContent from './outline.html'
Expand Down
2 changes: 1 addition & 1 deletion stories/html/cards/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import cardsContent from './cards.html'

<Meta title="Cards" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/content/content.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import contentHtml from './content.html'

<Meta title="Content" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/dropdowns/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import dropdownsContent from './dropdowns.html'
import dropupContent from './dropup.html'
import variationsContent from './variations.html'
Expand Down
2 changes: 1 addition & 1 deletion stories/html/floating/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import floatingContent from './floating.html'

<Meta title="Floating" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/form/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from '@storybook/client-api';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import '../../../dist/js/prestashop-ui-kit.js';
import inputContent from './input.html'
import numberContent from './number.html'
Expand Down
2 changes: 1 addition & 1 deletion stories/html/headings/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import headingsContent from './headings.html'

<Meta title="Headings" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/helpbox/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from '@storybook/client-api';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import helpboxContent from './helpbox.html'

<Meta title="Helpbox" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/images/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import imagesContent from './images.html'

<Meta title="Images" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/list-group/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import listGroupContent from './list-group.html'

<Meta title="List group" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/modal/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import modalContent from './modal.html'

<Meta title="Modals" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/navigation/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import navtabsContent from './navtabs.html';
import navWithoutBackgroundContent from './navtabs-without-background.html';

Expand Down
2 changes: 1 addition & 1 deletion stories/html/pagination/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import basicContent from './basic.html';
import withInputContent from './pagination-with-input.html';

Expand Down
2 changes: 1 addition & 1 deletion stories/html/popovers/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from '@storybook/client-api';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import popoversContent from './popovers.html'

<Meta title="Popovers" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/progress/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import progressContent from './progress.html'

<Meta title="Progress Bar" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/ps-tags/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from 'react';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import tagsContent from './tags.html'

<Meta title="PS Tags" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/spinner/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import spinnerContent from './spinner.html'

<Meta title="Spinner" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/tables/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import basicContent from './basic.html'
import borderedContent from './bordered.html'
import hoverableContent from './hoverable.html'
Expand Down
2 changes: 1 addition & 1 deletion stories/html/texts/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import textsContent from './texts.html'

<Meta title="Texts" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/toasts/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from '@storybook/client-api';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import toastsContent from './toasts.html';
import markupContent from './markup.html';
import LinkTo from '@storybook/addon-links/react';
Expand Down
2 changes: 1 addition & 1 deletion stories/html/tooltips/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from '@storybook/client-api';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import tooltipsContent from './tooltips.html'

<Meta title="Tooltips" />
Expand Down
2 changes: 1 addition & 1 deletion stories/html/variables/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import basics from '../../../scss/export/_basic.scss';
import principal from '../../../scss/export/_principal.scss';
import principalVariations from '../../../scss/export/_principal-variations.scss';
Expand Down

0 comments on commit 21c0f94

Please sign in to comment.