Skip to content

Commit 6af82ef

Browse files
jadjoubranjadjoubran
committed
Design fixes by @nicolesaidy #202 
1 parent 921a7d9 commit 6af82ef

File tree

9 files changed

+36
-16
lines changed

9 files changed

+36
-16
lines changed

‎angular/app/components/login-form/login-form.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
</md-input-container>
1414
</div>
1515

16-
<md-button type="submit" class="LoginForm-submit md-primary md-raised">Login</md-button>
16+
<md-button type="submit" class="LoginForm-submit md-primary md-raised">Log in</md-button>
1717
</form>

‎angular/app/components/login-form/login-form.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@
88
.LoginForm-submit{
99
margin-bottom: 40px;
1010
margin-left: 0;
11+
width: 100%;
12+
padding: 5px 0;
1113
}

‎angular/app/components/register-form/register-form.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<form ng-submit="vm.register()">
22
<div>
3-
<md-input-container>
3+
<md-input-container class="RegisterForm-inputContainer">
44
<label>Name</label>
55
<input type="text" ng-model="vm.name">
66
</md-input-container>
77
</div>
88

99
<div>
10-
<md-input-container>
10+
<md-input-container class="RegisterForm-inputContainer">
1111
<label>Email</label>
1212
<input type="email" ng-model="vm.email">
1313
</md-input-container>
1414
</div>
1515

1616
<div>
17-
<md-input-container>
17+
<md-input-container class="RegisterForm-inputContainer">
1818
<label>Password</label>
1919
<input type="password" ng-model="vm.password">
2020
</md-input-container>
2121
</div>
2222

23-
<md-button type="submit" class="md-primary md-raised">Register</md-button>
23+
<md-button type="submit" class="RegisterForm-submit md-primary md-raised">Register</md-button>
2424
</form>

‎angular/app/components/register-form/register-form.less

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.RegisterForm-inputContainer{
2+
margin-top: 10px;
3+
margin-bottom: 0px;
4+
width: 80%;
5+
min-width: 300px;
6+
}
7+
8+
.RegisterForm-submit{
9+
margin-bottom: 40px;
10+
margin-left: 0;
11+
width: 100%;
12+
padding: 5px 0;
13+
}

‎angular/app/pages/login/login.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.Login-formContainer{
2-
margin-top: 40px;
3-
margin-bottom: 40px;
2+
margin-top: 80px;
3+
margin-bottom: 80px;
44
}

‎angular/app/pages/login/login.page.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<md-content class="Page-container">
2-
<div flex="80" flex-offset="10">
3-
<div class="Login-formContainer md-whiteframe-z1" layout="column" layout-align="center center">
4-
<h1 class="md-headline">Login</h1>
2+
<div class="Login-formContainer" layout="column" layout-align="center center">
53

6-
<login-form></login-form>
4+
<h1 class="md-headline">Log in to your account</h1>
75

8-
</div>
9-
</div>
6+
<login-form></login-form>
7+
8+
</div>
109
</md-content>

‎angular/app/pages/register/register.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.Register-formContainer{
2+
margin-top: 80px;
3+
margin-bottom: 80px;
4+
}

‎angular/app/pages/register/register.page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<md-content class="Page-container">
22
<div flex="80" flex-offset="10">
3-
<div class="md-whiteframe-z1" layout="column" layout-align="center center">
4-
<h1 class="md-headline">Register</h1>
3+
<div class="Register-formContainer" layout="column" layout-align="center center">
4+
<h1 class="md-headline">Create an account</h1>
55

66
<register-form></register-form>
77

‎angular/config/theme.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ export function ThemeConfig($mdThemingProvider) {
22
'ngInject';
33
/* For more info, visit https://material.angularjs.org/#/Theming/01_introduction */
44
$mdThemingProvider.theme('default')
5-
.primaryPalette('indigo')
5+
.primaryPalette('light-blue', {
6+
default: '600'
7+
})
68
.accentPalette('grey')
79
.warnPalette('red');
810
}

0 commit comments

Comments
 (0)