Skip to content

Commit

Permalink
Merge branch 'master' into fix-dropdown-content
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeliwo committed Feb 28, 2020
2 parents 9952259 + a26be0a commit 082a26f
Show file tree
Hide file tree
Showing 12 changed files with 1,013 additions and 2,431 deletions.
6 changes: 5 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"stylelint-config-styled-components",
"stylelint-config-prettier"
],
"rules": {},
"rules": {
"value-keyword-case": ["lower", {
ignoreKeywords: "dummyValue"
}]
},
"syntax": "scss"
}
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [6.2.0](https://github.com/kufu/smarthr-ui/compare/v6.1.1...v6.2.0) (2020-02-13)


### Features

* add icon ([090d48c](https://github.com/kufu/smarthr-ui/commit/090d48ced891c50938a1f727fde682f472efae3c))
* add TBD stories ([#598](https://github.com/kufu/smarthr-ui/issues/598)) ([4c16fdc](https://github.com/kufu/smarthr-ui/commit/4c16fdc97e35c63c83220427c27cd968f965a01c))
* add TEXT_LINK to palette ([#597](https://github.com/kufu/smarthr-ui/issues/597)) ([abb8029](https://github.com/kufu/smarthr-ui/commit/abb8029d6fb21ee4bfa35ab27cfc3345aa77268b))


### Bug Fixes

* dropdown flickers ([#650](https://github.com/kufu/smarthr-ui/issues/650)) ([32ccc98](https://github.com/kufu/smarthr-ui/commit/32ccc985b45876a94a9f1a9e38e97b047175d89b))
* lint for InformationPanel ([f85e8af](https://github.com/kufu/smarthr-ui/commit/f85e8af5870087dc52c5116ff1303b9edf9c53cb))
* long title InformationPanel ([b9d47b5](https://github.com/kufu/smarthr-ui/commit/b9d47b5ee37438f546cd8665464fc6ff8f050e8e))

### [6.1.1](https://github.com/kufu/smarthr-ui/compare/v6.1.0...v6.1.1) (2020-01-21)


Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "smarthr-ui",
"description": "SmartHR ui components built with React.",
"version": "6.1.1",
"version": "6.2.0",
"author": "SmartHR-UI Team",
"dependencies": {
"lodash.merge": "^4.6.2",
Expand All @@ -21,24 +21,24 @@
"@storybook/cli": "^5.3.2",
"@storybook/react": "^5.3.2",
"@storybook/theming": "^5.3.2",
"@types/enzyme": "^3.10.4",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/jest": "^25.1.1",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^25.1.3",
"@types/lodash.merge": "^4.6.6",
"@types/lodash.range": "^3.2.6",
"@types/react": "^16.9.19",
"@types/react-dom": "^16.9.5",
"@types/react-test-renderer": "^16.9.2",
"@types/react-transition-group": "^4.2.3",
"@types/styled-components": "^4.4.0",
"@types/styled-components": "^5.0.1",
"babel-loader": "^8.0.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-to-json": "^3.4.4",
"eslint": "^6.8.0",
"eslint-config-smarthr": "^2.0.0",
"fixpack": "^2.3.1",
"husky": "^4.2.1",
"fixpack": "^3.0.5",
"husky": "^4.2.3",
"jest": "^25.1.0",
"lint-staged": "^10.0.7",
"npm-run-all": "^4.1.5",
Expand All @@ -49,24 +49,24 @@
"reg-keygen-git-hash-plugin": "^0.8.5",
"reg-notify-github-plugin": "^0.8.5",
"reg-publish-s3-plugin": "^0.9.0",
"reg-suit": "^0.8.6",
"reg-suit": "^0.10.0",
"standard-version": "^7.1.0",
"storybook-readme": "^5.0.8",
"storycap": "^2.3.4",
"styled-components": "^4.4.0",
"stylelint": "^13.0.0",
"styled-components": "^5.0.1",
"stylelint": "^13.2.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-standard": "^19.0.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.9.0",
"ts-jest": "^25.0.0",
"stylelint-processor-styled-components": "^1.10.0",
"ts-jest": "^25.2.1",
"ts-loader": "^6.2.1",
"typescript": "^3.7.5"
"typescript": "^3.8.2"
},
"peerDependencies": {
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-components": "^4.4.0"
"styled-components": "^5.0.1"
},
"bugs": {
"url": "https://github.com/kufu/smarthr-ui/issues"
Expand Down
Loading

0 comments on commit 082a26f

Please sign in to comment.