Skip to content

Commit

Permalink
[explorer] fix: horizontal scrollbar issue #1129
Browse files Browse the repository at this point in the history
* [explorer] fix: horizontal scrollbar issue

* [explorer] fix: scrollbar will appear below table instead of pagination component
  • Loading branch information
AnthonyLaw authored Oct 14, 2022
1 parent 24ba6e4 commit d825340
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 20 deletions.
43 changes: 24 additions & 19 deletions src/components/tables/TableListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,26 +75,28 @@
</tr>
</tbody>
</table>
<div v-if="pagination || timelinePagination" class="bottom">
<div class="pagination-wrapper">
<Pagination
:canFetchPrevious="prevPageExist"
:canFetchNext="nextPageExist"
:goUp="false"
:currentPageNumber="pageNumber"
:lastPageNumber="lastPage"
class="pagination"
@next="nextPage"
@previous="prevPage"
@firstPage="goFirstPage"
@lastPage="goLastPage"
@fetchPage="fetchPage($event)"
/>
<Loading small v-if="paginationLoading" />
</div>
</div>
</div>

<div v-else class="empty-data">{{emptyDataMessageFormatted}}</div>

<div v-if="(pagination || timelinePagination) && dataIsNotEmpty" class="bottom">
<div class="pagination-wrapper">
<Pagination
:canFetchPrevious="prevPageExist"
:canFetchNext="nextPageExist"
:goUp="false"
:currentPageNumber="pageNumber"
:lastPageNumber="lastPage"
class="pagination"
@next="nextPage"
@previous="prevPage"
@firstPage="goFirstPage"
@lastPage="goLastPage"
@fetchPage="fetchPage($event)"
/>
<Loading small v-if="paginationLoading" />
</div>
</div>
</div>
</template>

Expand Down Expand Up @@ -327,7 +329,10 @@ export default {
<style lang="scss" scoped>
.table-view {
overflow: auto;
.table-wrapper {
display: block;
overflow: auto;
}
.pointer {
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion src/views/PageAssembler.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default {
}
}
@media screen and (min-width: 80em) {
@media screen and (min-width: 1300px) {
.page-content-card-f {
padding-left: 80px;
padding-right: 80px;
Expand Down

0 comments on commit d825340

Please sign in to comment.