Skip to content

Commit

Permalink
Fixed #3103
Browse files Browse the repository at this point in the history
  • Loading branch information
Çağatay Çivici committed Jun 15, 2017
1 parent b7642b9 commit 135d34d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion src/app/components/datatable/datatable.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,14 @@

.ui-datatable .ui-paginator {
padding: .125em;
border-top: 0 none;
}

.ui-datatable .ui-paginator-top {
border-bottom-width: 0;
}

.ui-datatable .ui-paginator-bottom {
border-top-width: 0;
}

.ui-datatable-rtl {
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/datatable/datatable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ export class ScrollableView implements AfterViewInit,AfterViewChecked,OnDestroy
<ng-content select="p-header"></ng-content>
</div>
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks" styleClass="ui-paginator-bottom" [alwaysShow]="alwaysShowPaginator"
(onPageChange)="onPageChange($event)" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='bottom' || paginatorPosition =='both'"></p-paginator>
(onPageChange)="onPageChange($event)" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='bottom' || paginatorPosition =='both'" styleClass="ui-paginator-top"></p-paginator>
<div class="ui-datatable-tablewrapper" *ngIf="!scrollable">
<table [class]="tableStyleClass" [ngStyle]="tableStyle">
<thead class="ui-datatable-thead">
Expand Down Expand Up @@ -459,7 +459,7 @@ export class ScrollableView implements AfterViewInit,AfterViewChecked,OnDestroy
</ng-template>
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks" styleClass="ui-paginator-bottom" [alwaysShow]="alwaysShowPaginator"
(onPageChange)="onPageChange($event)" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='top' || paginatorPosition =='both'"></p-paginator>
(onPageChange)="onPageChange($event)" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='top' || paginatorPosition =='both'" styleClass="ui-paginator-bottom"></p-paginator>
<div class="ui-datatable-footer ui-widget-header" *ngIf="footer">
<ng-content select="p-footer"></ng-content>
</div>
Expand Down

0 comments on commit 135d34d

Please sign in to comment.