diff --git a/public/egologique_transparent_image.png b/public/egologique_transparent_image.png new file mode 100644 index 0000000..eaa5566 Binary files /dev/null and b/public/egologique_transparent_image.png differ diff --git a/src/components/DrawerComponent.js b/src/components/DrawerComponent.js index 8873bc2..57421ba 100644 --- a/src/components/DrawerComponent.js +++ b/src/components/DrawerComponent.js @@ -18,7 +18,7 @@ class DrawerComponent extends Component {
{this.props.current_activity.info.address} - + ); } @@ -29,9 +29,9 @@ class DrawerComponent extends Component { {this.props.current_activity.info.address} {this.props.finishButton() ? ( - + ) : ( - + )} ); @@ -60,7 +60,7 @@ class DrawerComponent extends Component {
- +
); @@ -84,9 +84,9 @@ class DrawerComponent extends Component { {this.props.finishButton() ? ( - + ) : ( - + )} )} diff --git a/src/components/LoginPage.js b/src/components/LoginPage.js index d949b41..469d63b 100644 --- a/src/components/LoginPage.js +++ b/src/components/LoginPage.js @@ -31,10 +31,9 @@ class LoginPage extends Component {
- eGOlogie -
-
-
+
+ +
{getFieldDecorator('email', { @@ -57,7 +56,7 @@ class LoginPage extends Component { })( Remember me )} - Or register now! diff --git a/src/components/SignupPage.js b/src/components/SignupPage.js index ee66a63..d38f16a 100644 --- 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. - Back to login} bordered={true}> + Back to login} bordered={true}> {getFieldDecorator('first_name', { @@ -77,7 +77,7 @@ class SignUp extends React.Component { )} - diff --git a/src/styles/App.css b/src/styles/App.css index 9533383..f9a1c8d 100644 --- a/src/styles/App.css +++ b/src/styles/App.css @@ -52,7 +52,7 @@ body { .login-card { width: 90vw; - height: 70vh; + height: fit-content; } } @@ -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 { @@ -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; }