Skip to content

Commit

Permalink
Merge pull request #24 from AxaFrance/feature/update-new-url
Browse files Browse the repository at this point in the history
fix(url): update url
  • Loading branch information
samuel-gomez-axa authored Dec 15, 2023
2 parents 303e1d4 + 7835ece commit 41867f1
Show file tree
Hide file tree
Showing 22 changed files with 403 additions and 388 deletions.
6 changes: 3 additions & 3 deletions gulpfile.babel.js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import sprite from './sprite';
import serve from './serve';
import copyIcons, { generatePugIcons } from './copyIcons';
import generateGithubInfos from './generateGithubInfos';
import generateContributors from './generateContributors';
// import generateContributors from './generateContributors';

const reloadImages = series(cleanImages, copyImages);
const build = series(
clean,
generateContributors,
// generateContributors,
copyIcons,
generateGithubInfos,
generatePugIcons,
Expand All @@ -27,7 +27,7 @@ const build = series(

const dev = series(
clean,
generateContributors,
// generateContributors,
copyIcons,
generateGithubInfos,
generatePugIcons,
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@axa-fr/design-system",
"name": "@axa-fr/site-slash",
"private": true,
"version": "1.3.14",
"description": "Static WebSite Design System, live documentation HTML/CSS and guidelines",
Expand Down
15 changes: 15 additions & 0 deletions slash.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"folders": [
{
"path": "."
}
],
"settings": {
"workbench.colorCustomizations": {
"activityBar.background": "#051a49",
"titleBar.activeBackground": "#01329d",
"titleBar.activeForeground": "#bfe3ff"
},
"typescript.tsdk": "node_modules/typescript/lib"
}
}
2 changes: 1 addition & 1 deletion src/assets/sprite/sprite.symbol.html
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ <h2>twitter</h2>

</section>
<footer>
<p>Generated at Tue, 21 Mar 2023 14:48:15 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
<p>Generated at Fri, 15 Dec 2023 10:00:33 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
</footer>
</body>
</html>
2 changes: 1 addition & 1 deletion src/data/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"storybookIframeUrl": "https://axafrance.github.io/react-toolkit/latest/storybook/iframe.html?id=",
"githubBaseUrl": "https://github.com/AxaFrance/react-toolkit/tree/master/packages/",
"badgeBaseUrl": "https://badge.fury.io/js/",
"baseUrlProd": "https://axafrance.github.io/design-system"
"baseUrlProd": "https://axafrance.github.io/site-slash"
}
2 changes: 1 addition & 1 deletion src/pages/atoms/button/markdown/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ d) Rédaction
e) Pictogrammes

- Taille 16\*16 px
- Uniquement de la <a href="https://axafrance.github.io/design-system/guidelines/icones" title="icon design system Axa" >liste des pictogrammes du Design System</a>
- Uniquement de la <a href="https://axafrance.github.io/site-slash/guidelines/icones" title="icon design system Axa" >liste des pictogrammes du Design System</a>
- Espacement avec le label de 16px
- Centré dans la hauteur du bouton

Expand Down
4 changes: 2 additions & 2 deletions src/pages/components/markdown/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Components are simple to use (just drag and drog it), simple to customize (by us

You can easily build a new app from scratch or integrate some component into existing application.

[html+css documentation website](https://axafrance.github.io/design-system)
[html+css documentation website](https://axafrance.github.io/site-slash)
[react storybook website](https://axafrance.github.io/react-toolkit/latest/storybook)

## Getting Started
Expand Down Expand Up @@ -97,7 +97,7 @@ Each component should be autonomous (HTML + CSS + JS) and extensible.

- BEM convention is used in order to break CSS cascading problem
- SCSS and CSS files are avalaible for every component and can be overrided or extended
- [HTML/CSS Documentation](https://axafrance.github.io/design-system/)
- [HTML/CSS Documentation](https://axafrance.github.io/site-slash/)

### React :

Expand Down
716 changes: 358 additions & 358 deletions src/pages/get-started/changelog/markdown/content.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/pages/get-started/github/markdown/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Components are simple to use (just drag and drog it), simple to customize (by us

You can easily build a new app from scratch or integrate some component into existing application.

[html+css documentation website](https://axafrance.github.io/design-system)
[html+css documentation website](https://axafrance.github.io/site-slash)
[react storybook website](https://axafrance.github.io/react-toolkit/latest/storybook)

## Getting Started
Expand Down Expand Up @@ -97,7 +97,7 @@ Each component should be autonomous (HTML + CSS + JS) and extensible.

- BEM convention is used in order to break CSS cascading problem
- SCSS and CSS files are avalaible for every component and can be overrided or extended
- [HTML/CSS Documentation](https://axafrance.github.io/design-system/)
- [HTML/CSS Documentation](https://axafrance.github.io/site-slash/)

### React :

Expand Down
6 changes: 3 additions & 3 deletions src/pages/get-started/how-to-contribute/markdown/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Before you start developping, it is important to always keep your forked reposit
For this, you will add a remote which points to the original repository (this has to be done only once):

```sh
git remote add upstream https://github.com/AxaGuilDEv/react-toolkit.git
git remote add upstream https://github.com/AxaFrance/react-toolkit.git
```

### Update your master branch
Expand Down Expand Up @@ -105,7 +105,7 @@ Or, if you want to run your component in watch mode, execting one of command bel

```sh
# If your component is in js
npm run dev:js -- --scope=@axa-fr/react-toolkit-status
npm run dev:js -- --scope=@axa-fr/react-toolkit-action

# If your component is in TypeScript
npm run dev:ts -- --scope=@axa-fr/react-toolkit-action
Expand Down Expand Up @@ -157,7 +157,7 @@ If you are developping on a Mac, you will find some Virtual Machines to help you

After working on a component, you are expected to update the documentation.

Documentation can be found in the [Design System](https://github.com/AxaGuilDEv/design-system) repository.
Documentation can be found in the [Design System](https://github.com/AxaFrance/design-system) repository.

There, do not forget to update the component status page, please!

Expand Down
4 changes: 2 additions & 2 deletions src/pages/get-started/markdown/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import './myheader.scss';

Vous avez la possibilité d'utiliser les variables du framework et vous pouvez même surcharger leur valeurs.

La liste des variables est de couleurs est disponibles sur la [page des couleurs.](https://axafrance.github.io/design-system/guidelines/color/)
La liste des variables est de couleurs est disponibles sur la [page des couleurs.](https://axafrance.github.io/site-slash/guidelines/color/)

Vous pouvez importer les variables dans le fichier SASS de votre composant :

Expand All @@ -53,7 +53,7 @@ Vous pouvez importer les variables dans le fichier SASS de votre composant :

## Icons

Le framework met à disposition un [ensemble d'icones](https://axafrance.github.io/design-system/guidelines/icones/) utilisables de plusieurs manières :
Le framework met à disposition un [ensemble d'icones](https://axafrance.github.io/site-slash/guidelines/icones/) utilisables de plusieurs manières :

Solution 1 : **classes CSS**

Expand Down
4 changes: 2 additions & 2 deletions src/pages/guidelines/markdown/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Components are simple to use (just drag and drog it), simple to customize (by us

You can easily build a new app from scratch or integrate some component into existing application.

[html+css documentation website](https://axafrance.github.io/design-system)
[html+css documentation website](https://axafrance.github.io/site-slash)
[react storybook website](https://axafrance.github.io/react-toolkit/latest/storybook)

## Getting Started
Expand Down Expand Up @@ -97,7 +97,7 @@ Each component should be autonomous (HTML + CSS + JS) and extensible.

- BEM convention is used in order to break CSS cascading problem
- SCSS and CSS files are avalaible for every component and can be overrided or extended
- [HTML/CSS Documentation](https://axafrance.github.io/design-system/)
- [HTML/CSS Documentation](https://axafrance.github.io/site-slash/)

### React :

Expand Down
2 changes: 1 addition & 1 deletion src/pages/molecules/form-pass/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/organisms/form/" title="guidelines form components" >all forms guidelines</a>
See <a href="https://axafrance.github.io/site-slash/organisms/form/" title="guidelines form components" >all forms guidelines</a>
2 changes: 1 addition & 1 deletion src/pages/molecules/form-text/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/organisms/form/" title="guidelines form components" >all forms guidelines</a>
See <a href="https://axafrance.github.io/site-slash/organisms/form/" title="guidelines form components" >all forms guidelines</a>
2 changes: 1 addition & 1 deletion src/pages/molecules/form-textarea/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/organisms/form/" title="guidelines form components" >all forms guidelines</a>
See <a href="https://axafrance.github.io/site-slash/organisms/form/" title="guidelines form components" >all forms guidelines</a>
2 changes: 1 addition & 1 deletion src/pages/molecules/pager/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/molecules/table" title="table component" >Table guidelines</a>
See <a href="https://axafrance.github.io/site-slash/molecules/table" title="table component" >Table guidelines</a>
2 changes: 1 addition & 1 deletion src/pages/molecules/steps/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/molecules/steps-new/" title="guidelines step components" >New Step guidelines</a>
See <a href="https://axafrance.github.io/site-slash/molecules/steps-new/" title="guidelines step components" >New Step guidelines</a>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/organisms/form/" title="guidelines form components" >all forms guidelines</a>
See <a href="https://axafrance.github.io/site-slash/organisms/form/" title="guidelines form components" >all forms guidelines</a>
2 changes: 1 addition & 1 deletion src/pages/organisms/form-filter/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/organisms/form/" title="guidelines form components" >all forms guidelines</a>
See <a href="https://axafrance.github.io/site-slash/organisms/form/" title="guidelines form components" >all forms guidelines</a>
2 changes: 1 addition & 1 deletion src/pages/organisms/paging/markdown/guidelines.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See <a href="https://axafrance.github.io/design-system/molecules/table" title="table component" >Table guidelines</a>
See <a href="https://axafrance.github.io/site-slash/molecules/table" title="table component" >Table guidelines</a>
4 changes: 2 additions & 2 deletions src/pages/patterns/markdown/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Components are simple to use (just drag and drog it), simple to customize (by us

You can easily build a new app from scratch or integrate some component into existing application.

[html+css documentation website](https://axafrance.github.io/design-system)
[html+css documentation website](https://axafrance.github.io/site-slash)
[react storybook website](https://axafrance.github.io/react-toolkit/latest/storybook)

## Getting Started
Expand Down Expand Up @@ -97,7 +97,7 @@ Each component should be autonomous (HTML + CSS + JS) and extensible.

- BEM convention is used in order to break CSS cascading problem
- SCSS and CSS files are avalaible for every component and can be overrided or extended
- [HTML/CSS Documentation](https://axafrance.github.io/design-system/)
- [HTML/CSS Documentation](https://axafrance.github.io/site-slash/)

### React :

Expand Down

0 comments on commit 41867f1

Please sign in to comment.