Skip to content

Commit 0ab1e7d

Browse files
author
Ihor Khomiak
committed
refactoring
1 parent 938611a commit 0ab1e7d

File tree

8 files changed

+51
-33
lines changed

8 files changed

+51
-33
lines changed

‎app/budget/budget.component.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ TextField {
2020
width: 100%;
2121
text-align: center;
2222
font-size: 40pt;
23-
border: 1pt solid silver;
2423
}
2524

2625
.value-label {

‎app/budget/budget.component.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
class="info-edit-label"></Label>
5353
<TextField [text]="budgetService.budget"
5454
keyboardType="number"
55-
#editBudgetTextField
56-
keyboardType="number"></TextField>
55+
#editBudgetTextField></TextField>
5756
</StackLayout>
5857
</StackLayout>
5958

‎app/budget/budget.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export class BudgetComponent {
3939

4040
onCancelButtonTap() {
4141
this.state = 'read';
42-
this.routerExtensions.back();
4342
}
4443

4544
onBackTap() {

‎app/login/login.component.css‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
.login-view
2-
{
1+
.container {
32
padding-left: 40;
43
padding-right: 40;
54
}
65

7-
.btn-login
8-
{
6+
.group {
7+
padding: 5pt;
8+
}
9+
10+
.btn-login {
911
background-color: #7ada2f;
1012
color: aliceblue;
13+
margin-bottom: 7pt;
1114
}

‎app/login/login.component.html‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
<ActionBar title="Money Tracker "
2-
class="action-bar">
2+
class="action-bar">
33
</ActionBar>
44

5-
<StackLayout verticalAlignment="center" class="login-view" >
6-
<StackLayout>
7-
<Label text="Email" class="label font-weight-bold m-b-5"></Label>
8-
<TextField keyboardType="email"autocorrect="false"></TextField>
9-
</StackLayout>
10-
<StackLayout class="input-field">
11-
<Label text="Password" class="label font-weight-bold m-b-5"></Label>
12-
<TextField secure="true"></TextField>
13-
</StackLayout>
14-
<Button text="Login" class="btn-login" (tap)="login()"></Button>
15-
<Label [nsRouterLink]="['/register']" text="Not a member? Register here." class="text-center footnote"></Label>
5+
<StackLayout verticalAlignment="center"
6+
class="container">
7+
<StackLayout class="group">
8+
<Label text="Email"
9+
class="label font-weight-bold m-b-5"></Label>
10+
<TextField keyboardType="email"
11+
autocorrect="false"></TextField>
12+
</StackLayout>
13+
<StackLayout class="group">
14+
<Label text="Password"
15+
class="label font-weight-bold m-b-5"></Label>
16+
<TextField secure="true"></TextField>
17+
</StackLayout>
18+
<StackLayout class="group">
19+
<Button text="Login"
20+
class="btn-login"
21+
(tap)="login()"></Button>
22+
<Label [nsRouterLink]="['/register']"
23+
text="Not a member? Register here."
24+
class="text-center footnote"></Label>
25+
</StackLayout>
1626
</StackLayout>

‎app/register/register.component.css‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
.register-view
2-
{
1+
.container {
32
padding-left: 50;
43
padding-right: 50;
54
}
65

7-
.btn-register
8-
{
6+
.btn-register {
97
background-color: #7ada2f;
108
color: aliceblue;
119
}

‎app/register/register.component.html‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
<ActionBar title="Register" class="action-bar">
1+
<ActionBar title="Register"
2+
class="action-bar">
23
</ActionBar>
34

4-
<StackLayout verticalAlignment="center" class="register-view" >
5-
<Label text="Name" class="label font-weight-bold m-b-5"></Label>
5+
<StackLayout verticalAlignment="center"
6+
class="container" >
7+
<Label text="Name"
8+
class="label font-weight-bold m-b-5"></Label>
69
<TextField></TextField>
7-
<Label text="Surname" class="label font-weight-bold m-b-5"></Label>
10+
<Label text="Surname"
11+
class="label font-weight-bold m-b-5"></Label>
812
<TextField></TextField>
9-
<Label text="Login" class="label font-weight-bold m-b-5"></Label>
13+
<Label text="Login"
14+
class="label font-weight-bold m-b-5"></Label>
1015
<TextField></TextField>
11-
<Label text="Email" class="label font-weight-bold m-b-5"></Label>
16+
<Label text="Email"
17+
class="label font-weight-bold m-b-5"></Label>
1218
<TextField></TextField>
13-
<Label text="Password" class="label font-weight-bold m-b-5"></Label>
19+
<Label text="Password"
20+
class="label font-weight-bold m-b-5"></Label>
1421
<TextField secure="true"></TextField>
15-
<Button [nsRouterLink]="['']" text="Register" class="btn-register"></Button>
22+
<Button [nsRouterLink]="['']"
23+
text="Register"
24+
class="btn-register"></Button>
1625
</StackLayout>

‎app/tabs/calendar/date-range-cost-list/calendar-date-range-cost-list.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<list [items]="filteredCosts"></list>
2-
<Label text="Back to 'Calendar'" (tap)="onTap()"></Label>
2+
<Label text="Back to 'Calendar'"
3+
(tap)="onTap()"></Label>

0 commit comments

Comments
 (0)