Skip to content

Commit

Permalink
Merge pull request #179 from PrestaShop/develop
Browse files Browse the repository at this point in the history
Release 1.2.4
  • Loading branch information
Progi1984 authored Jan 18, 2022
2 parents 38cacc3 + abdcda3 commit e50424f
Show file tree
Hide file tree
Showing 67 changed files with 12,426 additions and 17,807 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
node-version: ${{ matrix.node }}

- name: Install dependencies
run: yarn
run: npm i

- name: Generate
run: yarn run build-storybook
run: npm run build-storybook

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: develop
1 change: 1 addition & 0 deletions .storybook/logo-prestashop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ module.exports = {
},
],
webpackFinal: (config) => {
config.resolve.alias['core-js/modules'] = '@storybook/core/node_modules/core-js/modules';
config.module.rules[3].use = 'html-loader?minimize=false';
config.module.rules.push({
test: /\.scss$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
include: path.resolve(__dirname, '../'),
});

return config;
},
addonActionsTheme: {
BASE_COLOR: 'red',
},
};
5 changes: 5 additions & 0 deletions .storybook/manager-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<style>
#panel-tab-content {
color: #272a2d;
}
</style>
7 changes: 7 additions & 0 deletions .storybook/manager.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import {addons} from '@storybook/addons';
import {themes} from '@storybook/theming';
import psTheme from './ps-theme';

addons.setConfig({
theme: psTheme,
});
33 changes: 33 additions & 0 deletions .storybook/ps-theme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import {create} from '@storybook/theming';
import logoUrl from './logo-prestashop.svg';

export default create({
base: 'dark',
brandTitle: 'PrestaShop',
brandUrl: 'https://www.prestashop.com',
brandImage: logoUrl,

colorPrimary: '#6c868e',
colorSecondary: '#25b9d7',

// UI
appBg: '#363a41',
appContentBg: 'white',
appBorderRadius: 4,

barTextColor: 'white',
barSelectedColor: '#25b9d7',
barBg: '#272a2d',

// Typography
fontBase: '"Open Sans", sans-serif',
fontCode: 'monospace',

// Text colors
textColor: 'white',
textInverseColor: 'rgba(255,255,255,0.9)',

// Form
inputTextColor: 'black',
inputBorderRadius: 4,
});
4 changes: 4 additions & 0 deletions .storybook/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
body {
background-color: transparent;
}

.os-host {
color: red;
}
10 changes: 5 additions & 5 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.

2 changes: 1 addition & 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 e50424f

Please sign in to comment.