Client: adjust viewport height

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index f11552ef6d9c511388f106fc81a3aaf432cbb8d2..627187bd05e2d3802ecc8aae35c6a289793e1362 100644 (file)
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -51,5 +51,6 @@ footer {
   padding: 10px 0;
   text-align: center;
   font-size: 11px;
-  margin-top: 30px;
+  margin-top: $footer-margin;
+  height: $footer-height;
 }

diff --git a/client/src/app/videos/video-list/video-list.component.html b/client/src/app/videos/video-list/video-list.component.html
index 72d5512a66a2cbea5a563c6dd9656c0d9e7dfc6b..f805922798292249a6def1a485f39d89828ce8e5 100644 (file)
--- a/client/src/app/videos/video-list/video-list.component.html
+++ b/client/src/app/videos/video-list/video-list.component.html
@@ -22,7 +22,7 @@
   </my-video-miniature>
 </div>
 
-<pagination *ngIf="pagination.totalItems !== null"
+<pagination *ngIf="pagination.totalItems !== null && pagination.totalItems !== 0"
   [totalItems]="pagination.totalItems" [itemsPerPage]="pagination.itemsPerPage" [maxSize]="6" [boundaryLinks]="true" [rotate]="false"
   [(ngModel)]="pagination.currentPage" (pageChanged)="onPageChanged($event)"
 ></pagination>

diff --git a/client/src/app/videos/video-list/video-list.component.scss b/client/src/app/videos/video-list/video-list.component.scss
index eddcf07769b173da71fff71e614ab87daba4fc89..b48a4f125f3caeff32000015c686916a62b5d1e7 100644 (file)
--- a/client/src/app/videos/video-list/video-list.component.scss
+++ b/client/src/app/videos/video-list/video-list.component.scss
@@ -18,7 +18,6 @@
 }
 
 .videos-miniatures {
-  min-height: 720px;
   text-align: center;
   padding-top: 0;
 

diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index 5c06fae9d1b952a5340bd9fb64e114906141c558..f0ffb43ba9c461f09f8636bbadb580b0bdcf2b19 100644 (file)
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -9,6 +9,9 @@ $menu-color-block: #686f77;
 $header-height: 65px;
 $header-border-color: #e9eff6;
 
+$footer-height: 30px;
+$footer-margin: 30px;
+
 $footer-border-color: $header-border-color;
 
 $video-miniature-other-infos: #686767;

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c0b40445e703c2af45fa5c1a72d33afc2228f3fa..b446dde2a9c006362487fb3d525a40a96c4234bc 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -40,6 +40,10 @@ input.readonly {
   position: fixed;
 }
 
+.main-row {
+  min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
+}
+
 .main-col {
 
   .content-padding {