Introduces buttons #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KaiVolland
force-pushed
the
introduce-buttons
branch
3 times, most recently
from
32c94c5
to
c0a28fe
Compare
KaiVolland
force-pushed
the
introduce-buttons
branch
from
c0a28fe
to
b1a79f6
Compare
KaiVolland
force-pushed
the
introduce-buttons
branch
from
b1a79f6
to
2b8ea14
Compare
KaiVolland
force-pushed
the
introduce-buttons
branch
from
e9661a1
to
1375bd4
Compare
KaiVolland
force-pushed
the
introduce-buttons
branch
from
8f5d28b
to
0934c37
Compare
|
@ahennr @dnlkoch @marcjansen |
dnlkoch
approved these changes
Sep 6, 2017
.eslintrc
Outdated
| @@ -14,16 +14,30 @@ | |||
| }, | |||
| "parser": "babel-eslint", | |||
| "globals": { | |||
| "ol": false | |||
| "ol": false, | |||
| "Promise": false, | |||
| const setup = () => { | ||
| const wrapper = mount(<SimpleButton />); | ||
| return wrapper; | ||
| }; |
There was a problem hiding this comment.
Can be replaced with TestUtils.mount().
| const setup = (props, context) => { | ||
| const wrapper = mount(<ToggleButton {...props} />, {context}); | ||
| return wrapper; | ||
| }; |
There was a problem hiding this comment.
Can be replaced with TestUtils.mount().
| const setup = (props, context) => { | ||
| const wrapper = mount(<ToggleGroup {...props} />, {context}); | ||
| return wrapper; | ||
| }; |
There was a problem hiding this comment.
Can be replaced with TestUtils.mount().
KaiVolland
force-pushed
the
introduce-buttons
branch
from
b54ee8f
to
664f3fc
Compare
marcjansen
approved these changes
Sep 6, 2017
| .example-block > span { | ||
| margin-right: 10px; | ||
| } | ||
| </style> |
package.json
Outdated
| @@ -53,15 +54,17 @@ | |||
| "build:examples": "rimraf ./build/examples/* && node tasks/build-examples.js && webpack --config webpack.examples.config.js", | |||
| "build:docs": "jsdoc --package ./package.json --readme ./README.md -c .jsdoc", | |||
| "build:js": "webpack --config webpack.development.config.js && webpack -p --config webpack.production.config.js", | |||
| "build": "npm run test && npm run build:examples && npm run build:docs && npm run build:js" | |||
| "build": "npm run clean && BABEL_ENV=build babel src -d dist" | |||
There was a problem hiding this comment.
Are you sure this is the right thing?
| }, | ||
| "dependencies": { | ||
| "antd": "2.12.8", | ||
| "lodash": "4.17.4", | ||
| "loglevel": "1.4.1", | ||
| "ol": "4.3.2", | ||
| "prop-types": "15.5.10", |
There was a problem hiding this comment.
This migfht be one of the causes of the merge conflict
There was a problem hiding this comment.
I don't get why adding a line causes conflicts but you were right.
KaiVolland
force-pushed
the
introduce-buttons
branch
from
664f3fc
to
fb1e3d2
Compare
annarieger
added a commit
that referenced
this pull request
Feb 1, 2018
Minor redlining enhancements
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces the buttons as our first components.
Also fixes the package build.
Adjusts eslint rules.
Adjust babel settings.