Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/sass functions packages Fixes #9 #12

Merged
merged 6 commits into from
Dec 10, 2018
Merged

Fix/sass functions packages Fixes #9 #12

merged 6 commits into from
Dec 10, 2018

Conversation

samuel-gomez-axa
Copy link
Contributor

  • Add Sass functions, mixins and variable un one core.scss file
  • Import it in each packages
  • Update the demo to use only .scss files of used toolkit packages

guillaumechervetaxa
guillaumechervetaxa reviewed Nov 30, 2018
View reviewed changes
examples/demo/src/shared/utils/_vars.scss Outdated
@import '../../../node_modules/bootstrap/scss/_functions.scss';
@import '../../../node_modules/bootstrap/scss/_mixins.scss';
@import '../../../node_modules/bootstrap/scss/_variables.scss';
@import '../../../node_modules/@axa-fr/react-toolkit-core/dist/assets/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job Samuel !

is it possible to set up non relative links?
like "@axa-fr/react-toolkit-core" instead of '../../../node_modules/@axa-fr/react-toolkit-core/'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @guillaumechervetaxa :)
This file is no longer used, i deleted this.
I also had overridable variables scss in my last commit

guillaumechervetaxa
guillaumechervetaxa reviewed Dec 3, 2018
View reviewed changes
packages/Form/Input/switch/src/switch.scss Outdated
@@ -1,3 +1,5 @@
@import '../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"@axa-fr/react-toolkit-core/src/common/scss/core" instead of '../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core' ?

guillaumechervetaxa
guillaumechervetaxa reviewed Dec 3, 2018
View reviewed changes
packages/Form/Input/text/src/inputtext.scss Outdated
@@ -1,3 +1,5 @@
@import '../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idem

guillaumechervetaxa
guillaumechervetaxa reviewed Dec 3, 2018
View reviewed changes
packages/Form/Input/textarea/src/textarea.scss Outdated
@@ -1,3 +1,5 @@
@import '../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idem for all

guillaumechervetaxa
guillaumechervetaxa approved these changes Dec 10, 2018
View reviewed changes
packages/Form/Input/date/src/datepicker.scss Outdated
@@ -1,3 +1,6 @@
@import '@axa-fr/react-toolkit-core/src/common/scss/core.scss';
@import '../node_modules/react-datepicker/src/stylesheets/datepicker.scss';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/Drawer/drawer.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/Header/header.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/Infos/infos.scss Outdated
@@ -1,3 +1,4 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/Logo/logo.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/NavBar/nav.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/Title/title-bar.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/Layout/header/src/User/user.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/table/src/Pager/pager.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

packages/table/src/Paging/paging.scss Outdated
@@ -1,3 +1,5 @@
@import '../../node_modules/@axa-fr/react-toolkit-core/src/common/scss/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

@guillaumechervetaxa guillaumechervetaxa merged commit f6a015f into master Dec 10, 2018
@delete-merged-branch delete-merged-branch bot deleted the fix/sass-functions-packages branch December 10, 2018 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guillaumechervetaxa guillaumechervetaxa guillaumechervetaxa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@samuel-gomez-axa @guillaumechervetaxa