Skip to content

Commit

Permalink
Merge pull request #205 from PrestaShop/develop
Browse files Browse the repository at this point in the history
Release 1.2.6
  • Loading branch information
matks authored Dec 8, 2022
2 parents 72d2b46 + 128c1c6 commit 25c60e7
Show file tree
Hide file tree
Showing 22 changed files with 17,508 additions and 48,510 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [14]
node: [16]

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'
- run: npm install
- run: npm publish
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '10.x'
node-version: '16.x'

- run: npm install && npm run scss-lint
3 changes: 3 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ module.exports = {
addonActionsTheme: {
BASE_COLOR: 'red',
},
core: {
builder: 'webpack5',
},
};
2 changes: 1 addition & 1 deletion .storybook/ps-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import logoUrl from './logo-prestashop.svg';
export default create({
base: 'dark',
brandTitle: 'PrestaShop',
brandUrl: 'https://www.prestashop.com',
brandUrl: 'https://www.prestashop-project.org',
brandImage: logoUrl,

colorPrimary: '#6c868e',
Expand Down
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"stylelint-config-prestashop"
],
"rules": {
"function-blacklist": null
"function-disallowed-list": null,
"keyframes-name-pattern": null
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ If you keep both instances of NPM running, all your changes in the UI kit will b

## About PrestaShop

PrestaShop is a free and Open Source e-commerce web application written in PHP, committed to providing the best shopping cart experience for both merchants and customers. [Learn more about PrestaShop](http://www.prestashop.com)
PrestaShop is a free and Open Source e-commerce web application written in PHP, committed to providing the best shopping cart experience for both merchants and customers. [Learn more about PrestaShop](https://www.prestashop-project.org)

## License

Expand Down
8 changes: 4 additions & 4 deletions dist/css/bootstrap-prestashop-ui-kit.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-prestashop-ui-kit.css.map

Large diffs are not rendered by default.

103 changes: 102 additions & 1 deletion dist/js/prestashop-ui-kit.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/prestashop-ui-kit.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 25c60e7

Please sign in to comment.