aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-04-23 22:13:58 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-04-26 21:23:19 +0200
commitefbf0ed7f2a5d01fbcacc26dae1ff254c46b0ce5 (patch)
tree9c3749da7bb471ca4ac4e4b256e1863f200e3eb7
parent8ce9e815c8212647d702b94ca8633943d1aa663a (diff)
downloadPeerTube-efbf0ed7f2a5d01fbcacc26dae1ff254c46b0ce5.tar.gz
PeerTube-efbf0ed7f2a5d01fbcacc26dae1ff254c46b0ce5.tar.zst
PeerTube-efbf0ed7f2a5d01fbcacc26dae1ff254c46b0ce5.zip
Client: adjust viewport height
-rw-r--r--client/src/app/app.component.scss3
-rw-r--r--client/src/app/videos/video-list/video-list.component.html2
-rw-r--r--client/src/app/videos/video-list/video-list.component.scss1
-rw-r--r--client/src/sass/_variables.scss3
-rw-r--r--client/src/sass/application.scss4
5 files changed, 10 insertions, 3 deletions
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index f11552ef6..627187bd0 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -51,5 +51,6 @@ footer {
51 padding: 10px 0; 51 padding: 10px 0;
52 text-align: center; 52 text-align: center;
53 font-size: 11px; 53 font-size: 11px;
54 margin-top: 30px; 54 margin-top: $footer-margin;
55 height: $footer-height;
55} 56}
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 72d5512a6..f80592279 100644
--- 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 @@
22 </my-video-miniature> 22 </my-video-miniature>
23</div> 23</div>
24 24
25<pagination *ngIf="pagination.totalItems !== null" 25<pagination *ngIf="pagination.totalItems !== null && pagination.totalItems !== 0"
26 [totalItems]="pagination.totalItems" [itemsPerPage]="pagination.itemsPerPage" [maxSize]="6" [boundaryLinks]="true" [rotate]="false" 26 [totalItems]="pagination.totalItems" [itemsPerPage]="pagination.itemsPerPage" [maxSize]="6" [boundaryLinks]="true" [rotate]="false"
27 [(ngModel)]="pagination.currentPage" (pageChanged)="onPageChanged($event)" 27 [(ngModel)]="pagination.currentPage" (pageChanged)="onPageChanged($event)"
28></pagination> 28></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 eddcf0776..b48a4f125 100644
--- 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 @@
18} 18}
19 19
20.videos-miniatures { 20.videos-miniatures {
21 min-height: 720px;
22 text-align: center; 21 text-align: center;
23 padding-top: 0; 22 padding-top: 0;
24 23
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index 5c06fae9d..f0ffb43ba 100644
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -9,6 +9,9 @@ $menu-color-block: #686f77;
9$header-height: 65px; 9$header-height: 65px;
10$header-border-color: #e9eff6; 10$header-border-color: #e9eff6;
11 11
12$footer-height: 30px;
13$footer-margin: 30px;
14
12$footer-border-color: $header-border-color; 15$footer-border-color: $header-border-color;
13 16
14$video-miniature-other-infos: #686767; 17$video-miniature-other-infos: #686767;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c0b40445e..b446dde2a 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -40,6 +40,10 @@ input.readonly {
40 position: fixed; 40 position: fixed;
41} 41}
42 42
43.main-row {
44 min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
45}
46
43.main-col { 47.main-col {
44 48
45 .content-padding { 49 .content-padding {