Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
guilhermeborgesbastos committed May 21, 2020
2 parents 3c19bfe + afdffb2 commit c253776
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 6 deletions.
20 changes: 20 additions & 0 deletions src/app/posts/posts.component responsivity.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,26 @@
span {
margin: 5px;
}

.divider {
display: none;
}

.molding {
border: 3px solid #414c73;
display: inline-block;
padding: 0px 5px 5px 5px;
border-radius: 10px;

.icon {
font-size: 16px;
}

span {
margin: 5px;
font-size: 18px;
}
}
}
}
}
Expand Down
14 changes: 9 additions & 5 deletions src/app/posts/posts.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ <h1 i18n="nav@@posts">Posts</h1>
</div>
<div class="navigation">
<div class="previous" (click)="onClickPrevious()" [ngClass]="{'disabled': currentPage === 1}">
<fa-icon [icon]="faChevronLeft" class="icon" i18n-title="exp.nav@@previous" title="Previous"></fa-icon>
<span i18n="exp.nav@@previous">Previous</span>
<div class="molding">
<fa-icon [icon]="faChevronLeft" class="icon" i18n-title="exp.nav@@previous" title="Previous"></fa-icon>
<span i18n="exp.nav@@previous">Previous</span>
</div>
</div>
<div class="devider">|</div>
<div class="divider">|</div>
<div class="next" (click)="onClickNext()" [ngClass]="{'disabled': currentPage === ceil(posts?.length / resultsPerPage) }">
<span i18n="exp.nav@@next">Next</span>
<fa-icon [icon]="faChevronRight" class="icon" i18n-title="exp.nav@@next" title="Next"></fa-icon>
<div class="molding">
<span i18n="exp.nav@@next">Next</span>
<fa-icon [icon]="faChevronRight" class="icon" i18n-title="exp.nav@@next" title="Next"></fa-icon>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/posts/posts.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}
}

.devider {
.divider {
flex-grow: 1;
}

Expand Down

0 comments on commit c253776

Please sign in to comment.