Skip to content

Commit 432a9c1

Browse files
Breaking change: backgroundColor -> background
1 parent e786c3d commit 432a9c1

File tree

6 files changed

+44
-16
lines changed

6 files changed

+44
-16
lines changed

docs/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,24 @@
1919
"babel-preset-es2015": "^6.24.1",
2020
"babel-preset-react": "^6.24.1",
2121
"babel-preset-stage-0": "^6.24.1",
22+
"css-loader": "^2.1.0",
2223
"eslint": "^3.19.0",
2324
"eslint-config-airbnb": "^14.1.0",
2425
"eslint-plugin-import": "^2.2.0",
2526
"eslint-plugin-jsx-a11y": "^4.0.0",
2627
"eslint-plugin-react": "^6.10.3",
2728
"gh-pages": "^2.0.1",
2829
"html-webpack-plugin": "^2.28.0",
29-
"webpack": "2.4.1",
3030
"react-hot-loader": "next",
31+
"style-loader": "^0.23.1",
32+
"webpack": "2.4.1",
3133
"webpack-dev-server": "2.4.3"
3234
},
3335
"dependencies": {
3436
"@material-ui/core": "^1.5.1",
3537
"@material-ui/icons": "^3.0.1",
3638
"jss": "^9.8.2",
39+
"jss-keyframes": "^0.1.0",
3740
"jss-preset-default": "^4.5.0",
3841
"prop-types": "^15.5.8",
3942
"react": "^16.4.0",

docs/src/App.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#root {
2+
background: linear-gradient(-45deg, #EE7752, #E73C7E, #23A6D5, #23D5AB);
3+
background-size: 400% 400%;
4+
-webkit-animation: Gradient 15s ease infinite;
5+
-moz-animation: Gradient 15s ease infinite;
6+
animation: Gradient 15s ease infinite;
7+
}
8+
9+
@keyframes Gradient {
10+
0% {
11+
background-position: 0% 50%
12+
}
13+
50% {
14+
background-position: 100% 50%
15+
}
16+
100% {
17+
background-position: 0% 50%
18+
}
19+
}
20+

docs/src/App.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import React, { Component } from 'react';
2-
import MdAdd from '@material-ui/icons/add';
3-
import MdClose from '@material-ui/icons/clear';
4-
import MdFavorite from '@material-ui/icons/favorite';
52
import { FloatingMenu, MainButton, ChildButton } from 'react-floating-button-menu';
3+
import MdAdd from '@material-ui/icons/Add';
4+
import MdClose from '@material-ui/icons/Clear';
5+
import MdEdit from '@material-ui/icons/Edit';
6+
import MdStar from '@material-ui/icons/Star';
7+
import MdFavorite from '@material-ui/icons/Favorite';
68
import PropTypes from 'prop-types';
79
import { withStyles } from '@material-ui/core/styles';
810
import Paper from '@material-ui/core/Paper';
911
import InputLabel from '@material-ui/core/InputLabel';
1012
import MenuItem from '@material-ui/core/MenuItem';
1113
import FormControl from '@material-ui/core/FormControl';
1214
import Select from '@material-ui/core/Select';
15+
import './App.css';
1316

1417
const styles = theme => ({
1518
root: {
@@ -19,6 +22,7 @@ const styles = theme => ({
1922
flexDirection: 'column',
2023
width: '100%',
2124
height: '100vh',
25+
color: '#fff',
2226
},
2327
paper: {
2428
width: '100%',
@@ -38,6 +42,7 @@ const styles = theme => ({
3842
},
3943
});
4044

45+
4146
class App extends Component {
4247
static propTypes = {
4348
classes: PropTypes.object.isRequired,
@@ -77,24 +82,24 @@ class App extends Component {
7782
<MainButton
7883
iconResting={<MdAdd style={{ fontSize: 20 }} nativeColor="white" />}
7984
iconActive={<MdClose style={{ fontSize: 20 }} nativeColor="white" />}
80-
backgroundColor="black"
85+
background="linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)"
8186
onClick={() => this.setState({ isOpen: !this.state.isOpen })}
8287
size={56}
8388
/>
8489
<ChildButton
85-
icon={<MdFavorite style={{ fontSize: 20 }} nativeColor="black" />}
86-
backgroundColor="white"
90+
icon={<MdEdit style={{ fontSize: 20 }} nativeColor="white" />}
91+
background="linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)"
8792
size={40}
8893
onClick={() => console.log('First button clicked')}
8994
/>
9095
<ChildButton
91-
icon={<MdFavorite style={{ fontSize: 20 }} nativeColor="black" />}
92-
backgroundColor="white"
96+
icon={<MdFavorite style={{ fontSize: 20 }} nativeColor="white" />}
97+
background="linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)"
9398
size={40}
9499
/>
95100
<ChildButton
96-
icon={<MdFavorite style={{ fontSize: 20 }} nativeColor="black" />}
97-
backgroundColor="white"
101+
icon={<MdStar style={{ fontSize: 20 }} nativeColor="white" />}
102+
background="linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)"
98103
size={40}
99104
/>
100105
</FloatingMenu>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-floating-button-menu",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "A Customizable Material floating button menu implementation made with styled-component & react",
55
"devDependencies": {
66
"babel-core": "^6.24.1",

src/ChildButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import styled from 'styled-jss';
44
import PropTypes from 'prop-types';
55

66
const Wrapper = styled('li')(
7-
({ isOpen, slideSpeed, backgroundColor, size, iconColor, spacing, direction }) => ({
8-
backgroundColor,
7+
({ isOpen, slideSpeed, background, size, iconColor, spacing, direction }) => ({
8+
background,
99
display: 'flex',
1010
border: 'none',
1111
borderRadius: '50%',

src/MainButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
33
import styled from 'styled-jss';
44
import PropTypes from 'prop-types';
55

6-
const Wrapper = styled('a')(({ backgroundColor, size, iconColor }) => ({
6+
const Wrapper = styled('a')(({ background, size, iconColor }) => ({
77
color: iconColor,
88
display: 'flex',
99
border: 'none',
@@ -18,7 +18,7 @@ const Wrapper = styled('a')(({ backgroundColor, size, iconColor }) => ({
1818
alignItems: 'center',
1919
width: size,
2020
height: size,
21-
backgroundColor,
21+
background,
2222
}));
2323

2424
const IconWrapper = styled('div')(({ isOpen }) => ({

0 commit comments

Comments
 (0)