aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-06-12 12:26:48 +0200
committerRigel Kent <sendmemail@rigelk.eu>2020-06-12 12:26:48 +0200
commitd39db21a883d71d101912c0e6e42e97927edb693 (patch)
tree8870d55fdf49b0a2566fc1ca9e990bee1b9f56a2
parent435258ea3c17c10c7c2735075e59122956d45fca (diff)
downloadPeerTube-d39db21a883d71d101912c0e6e42e97927edb693.tar.gz
PeerTube-d39db21a883d71d101912c0e6e42e97927edb693.tar.zst
PeerTube-d39db21a883d71d101912c0e6e42e97927edb693.zip
match margin of abstract-video-list and sub-menu's fixed margin
-rw-r--r--client/src/app/+accounts/account-about/account-about.component.html24
-rw-r--r--client/src/app/+accounts/accounts.component.scss7
-rw-r--r--client/src/app/+video-channels/video-channel-about/video-channel-about.component.html36
-rw-r--r--client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html16
-rw-r--r--client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.scss4
-rw-r--r--client/src/app/+video-channels/video-channels.component.scss7
-rw-r--r--client/src/sass/include/_miniature.scss4
7 files changed, 61 insertions, 37 deletions
diff --git a/client/src/app/+accounts/account-about/account-about.component.html b/client/src/app/+accounts/account-about/account-about.component.html
index 3ae11b49c..1f1987aba 100644
--- a/client/src/app/+accounts/account-about/account-about.component.html
+++ b/client/src/app/+accounts/account-about/account-about.component.html
@@ -1,12 +1,14 @@
1<div *ngIf="account" class="row"> 1<div class="margin-content">
2 <div class="block col-md-6 col-sm-12"> 2 <div *ngIf="account" class="row no-gutters">
3 <div i18n class="small-title">DESCRIPTION</div> 3 <div class="block col-md-6 col-sm-12 pr-2">
4 <div class="content" [innerHtml]="getAccountDescription()"></div> 4 <div i18n class="small-title">DESCRIPTION</div>
5 <div class="content" [innerHtml]="getAccountDescription()"></div>
6 </div>
7
8 <div class="block col-md-6 col-sm-12">
9 <div i18n class="small-title">STATS</div>
10
11 <div i18n class="content">Joined {{ account.createdAt | date }}</div>
12 </div>
5 </div> 13 </div>
6 14</div>
7 <div class="block col-md-6 col-sm-12">
8 <div i18n class="small-title">STATS</div>
9
10 <div i18n class="content">Joined {{ account.createdAt | date }}</div>
11 </div>
12</div> \ No newline at end of file
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss
index 12170e371..e6ab3c036 100644
--- a/client/src/app/+accounts/accounts.component.scss
+++ b/client/src/app/+accounts/accounts.component.scss
@@ -15,6 +15,13 @@
15 } 15 }
16} 16}
17 17
18.margin-content {
19 // margin-content is required, but child views have their own margins
20 // that match views outside the scope of accounts, so we only align
21 // them with the margins of .sub-menu when required.
22 margin: 0;
23}
24
18.right-buttons { 25.right-buttons {
19 display: flex; 26 display: flex;
20 height: max-content; 27 height: max-content;
diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
index c02213ebb..8dff8ba91 100644
--- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
+++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
@@ -1,20 +1,22 @@
1<div *ngIf="videoChannel" class="row"> 1<div class="margin-content">
2 <div class="description col-md-6 col-sm-12"> 2 <div *ngIf="videoChannel" class="row no-gutters">
3 <div class="block"> 3 <div class="description col-md-6 col-sm-12 pr-2">
4 <div i18n class="small-title">DESCRIPTION</div> 4 <div class="block">
5 <div class="content" [innerHtml]="getVideoChannelDescription()"></div> 5 <div i18n class="small-title">DESCRIPTION</div>
6 <div class="content" [innerHtml]="getVideoChannelDescription()"></div>
7 </div>
8
9 <div class="block" *ngIf="supportHTML">
10 <div i18n class="small-title">SUPPORT THIS CHANNEL</div>
11 <div class="content" [innerHtml]="supportHTML"></div>
12 </div>
6 </div> 13 </div>
7 14
8 <div class="block" *ngIf="supportHTML"> 15 <div class="stats col-md-6 col-sm-12">
9 <div i18n class="small-title">SUPPORT THIS CHANNEL</div> 16 <div class="block">
10 <div class="content" [innerHtml]="supportHTML"></div> 17 <div i18n class="small-title">STATS</div>
18 <div i18n class="content">Created {{ videoChannel.createdAt | date }}</div>
19 </div>
11 </div> 20 </div>
12 </div> 21 </div>
13 22</div>
14 <div class="stats col-md-6 col-sm-12">
15 <div class="block">
16 <div i18n class="small-title">STATS</div>
17 <div i18n class="content">Created {{ videoChannel.createdAt | date }}</div>
18 </div>
19 </div>
20</div> \ No newline at end of file
diff --git a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html
index 3990e73da..663585010 100644
--- a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html
+++ b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html
@@ -1,11 +1,13 @@
1<div i18n class="title-page title-page-single"> 1<div class="margin-content">
2 Created {{ pagination.totalItems }} playlists 2 <div i18n class="title-page title-page-single">
3</div> 3 Created {{ pagination.totalItems }} playlists
4 </div>
4 5
5<div i18n class="no-results" *ngIf="pagination.totalItems === 0">This channel does not have playlists.</div> 6 <div i18n class="no-results" *ngIf="pagination.totalItems === 0">This channel does not have playlists.</div>
6 7
7<div class="video-playlist" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()"> 8 <div class="video-playlist" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
8 <div *ngFor="let playlist of videoPlaylists" class="playlist-miniature-container"> 9 <div *ngFor="let playlist of videoPlaylists" class="playlist-miniature-container">
9 <my-video-playlist-miniature [playlist]="playlist" [toManage]="false"></my-video-playlist-miniature> 10 <my-video-playlist-miniature [playlist]="playlist" [toManage]="false"></my-video-playlist-miniature>
11 </div>
10 </div> 12 </div>
11</div> 13</div>
diff --git a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.scss b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.scss
index f0fe7503f..cb2931858 100644
--- a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.scss
+++ b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.scss
@@ -1,3 +1,7 @@
1.title-page {
2 margin-top: 0;
3}
4
1.video-playlist { 5.video-playlist {
2 display: flex; 6 display: flex;
3 flex-wrap: wrap; 7 flex-wrap: wrap;
diff --git a/client/src/app/+video-channels/video-channels.component.scss b/client/src/app/+video-channels/video-channels.component.scss
index 0a49f53cf..22f21dcc6 100644
--- a/client/src/app/+video-channels/video-channels.component.scss
+++ b/client/src/app/+video-channels/video-channels.component.scss
@@ -40,6 +40,13 @@
40 } 40 }
41} 41}
42 42
43.margin-content {
44 // margin-content is required, but child views have their own margins
45 // that match views outside the scope of accounts, so we only align
46 // them with the margins of .sub-menu when required.
47 margin: 0;
48}
49
43.right-buttons { 50.right-buttons {
44 display: flex; 51 display: flex;
45 height: max-content; 52 height: max-content;
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss
index d79086723..d82d78d58 100644
--- a/client/src/sass/include/_miniature.scss
+++ b/client/src/sass/include/_miniature.scss
@@ -185,8 +185,8 @@ $play-overlay-width: 18px;
185} 185}
186 186
187@mixin fluid-videos-miniature-layout { 187@mixin fluid-videos-miniature-layout {
188 margin-left: 3vw !important; 188 margin-left: $not-expanded-horizontal-margins !important;
189 margin-right: 3vw !important; 189 margin-right: $not-expanded-horizontal-margins !important;
190 190
191 @media screen and (max-width: $mobile-view) { 191 @media screen and (max-width: $mobile-view) {
192 width: auto; 192 width: auto;