Skip to content

Commit

Permalink
Merge branch 'alex' into jo
Browse files Browse the repository at this point in the history
  • Loading branch information
@Drakota
Drakota committed May 6, 2018
2 parents ad1fdaa + 246382f commit d885b14
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 18 deletions.
Binary file added public/egologique_transparent_image.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/components/DrawerComponent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class DrawerComponent extends Component {
<div className={"handle"}></div>
<img className={"current-image"} src={this.props.current_activity.info.image} />
<span className={"current-address"}>{this.props.current_activity.info.address}</span>
<Button type="primary" onClick={this.props.reviewLocation} className={"current-next-button"}>Review</Button>
<Button type="primary" onClick={this.props.reviewLocation} className="current-next-button greenButton">Review</Button>
</div>
);
}
Expand All @@ -29,9 +29,9 @@ class DrawerComponent extends Component {
<img className={"current-image"} src={this.props.current_activity.info.image} />
<span className={"current-address"}>{this.props.current_activity.info.address}</span>
{this.props.finishButton() ? (
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button"}>Finish</Button>
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button greenButton"}>Finish</Button>
) : (
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button"}>Next</Button>
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button greenButton"}>Next</Button>
)}
</div>
);
Expand Down Expand Up @@ -60,7 +60,7 @@ class DrawerComponent extends Component {
</div>
<div style={{ display: 'flex' }}>
<Slider style={{ flex: 2, alignSelf: 'center', margin: 20, }} marks={marks} defaultValue={2} min={2} max={10} onChange={this.props.createRangeChange}/>
<Button style={{ flex: 1 }} onClick={this.props.createOnClick} className={"go-button"} type="primary">Go</Button>
<Button style={{ flex: 1 }} onClick={this.props.createOnClick} className="go-button greenButton" type="primary">Go</Button>
</div>
</div>
);
Expand All @@ -84,9 +84,9 @@ class DrawerComponent extends Component {
<Progress className={"progress-drawer"} type="circle" percent={this.props.progress} />
<Button type="danger" onClick={this.props.cancelRally} className={"current-next-button-drawer"}>Cancel</Button>
{this.props.finishButton() ? (
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer"}>Finish</Button>
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer greenButton"}>Finish</Button>
) : (
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer"}>Next</Button>
<Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer greenButton"}>Next</Button>
)}
</Drawer>
)}
Expand Down
9 changes: 4 additions & 5 deletions src/components/LoginPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ class LoginPage extends Component {
</video>
<div className={"login-filter"}/>
<Card className={"login-card"}>
eGOlogie
<div className="handle"></div>
<hr/>
<br/>
<div style={{ textAlign: 'center' }}>
<img width="200" src="/egologique_transparent_image.png" />
</div>
<Form onSubmit={this.handleSubmit} className="">
<FormItem>
{getFieldDecorator('email', {
Expand All @@ -57,7 +56,7 @@ class LoginPage extends Component {
})(
<Checkbox>Remember me</Checkbox>
)}
<Button loading={this.props.loginPending} type="primary" htmlType="submit" className="login-form-button">
<Button loading={this.props.loginPending} type="primary" htmlType="submit" className="login-form-button greenButton">
Log in
</Button>
Or <a href="/signup">register now!</a>
Expand Down
4 changes: 2 additions & 2 deletions src/components/SignupPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SignUp extends React.Component {
Your browser does not support the video tag.
</video>

<Card className="centerElement signUpCard" title="Sign up for eGOlogique" extra={<a href="/login">Back to login</a>} bordered={true}>
<Card className="centerElement signUpCard" title="Sign up for eGOlogic" extra={<a href="/login">Back to login</a>} bordered={true}>
<Form onSubmit={this.handleSubmit} className="">
<FormItem>
{getFieldDecorator('first_name', {
Expand Down Expand Up @@ -77,7 +77,7 @@ class SignUp extends React.Component {
)}
</FormItem>
<FormItem>
<Button type="primary" htmlType="submit" className="login-form-button signUpButton">
<Button type="primary" htmlType="submit" className="login-form-button signUpButton greenButton">
Sign up
</Button>
</FormItem>
Expand Down
14 changes: 9 additions & 5 deletions src/styles/App.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ body {

.login-card {
width: 90vw;
height: 70vh;
height: fit-content;
}
}

Expand Down Expand Up @@ -139,8 +139,7 @@ body {
background-color: rgba(255,255,255,0.9);
margin-top: 15vh;
width: 90vw;
max-width: 700px;
max-height: 55vh;
height: fit-content;
}

.signUpButton {
Expand Down Expand Up @@ -319,7 +318,12 @@ body {
color: rgba(0, 0, 0, 0.65);
text-decoration: none;
}

.modal-feedback {

.greenButton {
background-color: #8dc63f !important;
border-color: #8dc63f !important;
}

.greenText {
color: #8dc63f !important;
}

0 comments on commit d885b14

Please sign in to comment.