Skip to content

Commit

Permalink
Merge 01cc34f into 47701f4
Browse files Browse the repository at this point in the history
  • Loading branch information
amalv committed Feb 11, 2019
2 parents 47701f4 + 01cc34f commit c9ca601
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## [v0.9.0](https://github.com/amalv/react-universal/tree/v0.9.0) (2019-02-11)
[Full Changelog](https://github.com/amalv/react-universal/compare/v0.8.2...v0.9.0)

**Merged pull requests:**

- Add UserService [\#22](https://github.com/amalv/react-universal/pull/22) ([amalv](https://github.com/amalv))

## [v0.8.2](https://github.com/amalv/react-universal/tree/v0.8.2) (2019-02-09)
[Full Changelog](https://github.com/amalv/react-universal/compare/v0.8.1...v0.8.2)

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-universal",
"version": "0.8.2",
"version": "0.9.0",
"description": "",
"main": "webpack.config.js",
"scripts": {
Expand Down
5 changes: 4 additions & 1 deletion src/components/SignIn.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import Paper from "@material-ui/core/Paper";
import Typography from "@material-ui/core/Typography";
import { withTheme } from "@material-ui/core/styles";
import styled from "styled-components";
import type { Theme } from "@material-ui/core/styles/createMuiTheme";

type Props = { theme: Theme };

const Base = styled.main`
width: auto;
Expand Down Expand Up @@ -48,7 +51,7 @@ const SubmitButtonStyled = styled(Button)`
margin-top: ${theme => theme.spacing.unit * 3}px;
`;

const SignIn = props => {
const SignIn = (props: Props) => {
// eslint-disable-next-line react/prop-types
const { theme } = props;
const { zIndex, ...rest } = theme;
Expand Down
6 changes: 4 additions & 2 deletions src/components/SignUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import Paper from "@material-ui/core/Paper";
import Typography from "@material-ui/core/Typography";
import { withTheme } from "@material-ui/core/styles";
import styled from "styled-components";
import type { Theme } from "@material-ui/core/styles/createMuiTheme";

type Props = { theme: Theme };

const Base = styled.main`
width: auto;
Expand Down Expand Up @@ -48,8 +51,7 @@ const SubmitButtonStyled = styled(Button)`
margin-top: ${theme => theme.spacing.unit * 3}px;
`;

const SignUp = props => {
// eslint-disable-next-line react/prop-types
const SignUp = (props: Props) => {
const { theme } = props;
const { zIndex, ...rest } = theme;
return (
Expand Down

0 comments on commit c9ca601

Please sign in to comment.