wbrawner/twigs-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-dashboard-style' of billy/budget into master

Browse source
This commit is contained in:
Billy Brawner 2018-09-02 19:29:10 -05:00 committed by Gitea
commit 6decda838b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app/dashboard/dashboard.component.css
View file

@ -38,7 +38,7 @@
.dashboard-primary div { .dashboard-primary div {
bottom: 0.5em; bottom: 0.5em;
display: flex; display: flex;
justify-content: space-between; justify-content: flex-end;
left: 0.5em; left: 0.5em;
right: 0.5em; right: 0.5em;
position: absolute; position: absolute;
@ -55,6 +55,11 @@
padding: 1em; padding: 1em;
} }
.dashboard .no-categories p {
line-height: normal;
white-space: normal;
}
a.view-all { a.view-all {
position: absolute; position: absolute;
right: 0.5em; right: 0.5em;

4
src/app/dashboard/dashboard.component.html
View file

@ -12,7 +12,6 @@
<span [ngClass]="{'income': balance > 0, 'expense': balance < 0}" >{{ balance | currency }}</span> <span [ngClass]="{'income': balance > 0, 'expense': balance < 0}" >{{ balance | currency }}</span>
</h2> </h2>
<div class="transaction-navigation"> <div class="transaction-navigation">
<a mat-button routerLink="/transactions/new">Add Transaction</a>
<a mat-button routerLink="/transactions">View Transactions</a> <a mat-button routerLink="/transactions">View Transactions</a>
</div> </div>
</div> </div>
@ -28,3 +27,6 @@
<app-category-list [categories]="categories" [categoryBalances]="categoryBalances"></app-category-list> <app-category-list [categories]="categories" [categoryBalances]="categoryBalances"></app-category-list>
</div> </div>
</div> </div>
<a mat-fab routerLink="/transactions/new">
<mat-icon aria-label="Add">add</mat-icon>
</a>