Skip to content

Commit

Permalink
Merge branch 'dev:v0.2.0 fix default colors'
Browse files Browse the repository at this point in the history
  • Loading branch information
RoCky Wu committed Jun 5, 2016
2 parents 68361e2 + ad56559 commit f94eae8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import Ripples from 'react-ripples'

render() {
<div>
<Ripples>
<Ripples>
<button>Hello</button>
</Ripples>
</div>
Expand All @@ -44,7 +44,7 @@ static propTypes = {

static defaultProps = {
during: 600,
color: 'rgba(255, 255, 255, .5)',
color: 'rgba(0, 0, 0, .3)',
}
```

Expand Down
6 changes: 3 additions & 3 deletions demo/react-ripples.js
Original file line number Diff line number Diff line change
Expand Up @@ -8362,8 +8362,8 @@ return /******/ (function(modules) { // webpackBootstrap
position: 'absolute',
borderRadius: '50%',
opacity: 0,
width: 20,
height: 20,
width: 35,
height: 35,
transform: 'translate(-50%, -50%)',
pointerEvents: 'none'
};
Expand Down Expand Up @@ -8470,7 +8470,7 @@ return /******/ (function(modules) { // webpackBootstrap
};
Ripples.defaultProps = {
during: 600,
color: 'rgba(255, 255, 255, .5)'
color: 'rgba(0, 0, 0, .3)'
};


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-ripples",
"version": "0.1.1",
"version": "0.2.0",
"description": "The ripple effect everything",
"main": "dist/react-ripples.js",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const rippleStyle = {
position: 'absolute',
borderRadius: '50%',
opacity: 0,
width: 20,
height: 20,
width: 35,
height: 35,
transform: 'translate(-50%, -50%)',
pointerEvents: 'none',
}
Expand All @@ -24,7 +24,7 @@ class Ripples extends React.Component {

static defaultProps = {
during: 600,
color: 'rgba(255, 255, 255, .5)',
color: 'rgba(0, 0, 0, .3)',
}

state = {
Expand Down

0 comments on commit f94eae8

Please sign in to comment.