Add green theme

Drakota · May 6, 2018 · 246382f · 246382f
1 parent a2d1e19
commit 246382f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/components/DrawerComponent.js b/src/components/DrawerComponent.js
@@ -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>
         );
     }
@@ -28,7 +28,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.readyRally} className={"current-next-button"}>Next</Button>  
+                <Button type="primary" onClick={this.props.readyRally} className="current-next-button greenButton">Next</Button>  
             </div>
         );
     }
@@ -56,7 +56,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>
         );
@@ -78,8 +78,8 @@ class DrawerComponent extends Component {
                     <span className={"current-address-drawer"}>{this.props.current_activity.info.address}</span>
                     <Alert className={"alert-drawer"} message="Tip:" description={_.sample(GoodActions.data)} type="info" showIcon />
                     <Progress className={"progress-drawer"} type="circle" percent={this.props.progress} />
-                    <Button type="danger" onClick={this.props.cancelRally} className={"current-next-button-drawer"}>Cancel</Button> 
-                    <Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer"}>Next</Button>   
+                    <Button type="danger" onClick={this.props.cancelRally} className="current-next-button-drawer">Cancel</Button> 
+                    <Button type="primary" onClick={this.props.readyRally} className="current-next-button-drawer greenButton">Next</Button>   
                 </Drawer>
             )}
         </Fragment>

diff --git a/src/components/LoginPage.js b/src/components/LoginPage.js
@@ -56,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>

diff --git a/src/components/SignupPage.js b/src/components/SignupPage.js
@@ -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', {
@@ -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>

diff --git a/src/styles/App.css b/src/styles/App.css
@@ -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 {
@@ -318,3 +317,12 @@ body {
   color: rgba(0, 0, 0, 0.65);
   text-decoration: none;
 }
+
+.greenButton {
+  background-color: #8dc63f !important;
+  border-color: #8dc63f !important;
+}
+
+.greenText {
+  color:  #8dc63f !important;
+}