borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

match margin of abstract-video-list and sub-menu's fixed margin

Browse Source
This commit is contained in:
Rigel Kent 2020-06-12 12:26:48 +02:00
parent 435258ea3c
commit d39db21a88
No known key found for this signature in database
GPG Key ID: 5E53E96A494E452F
7 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/+accounts/account-about/account-about.component.html
View File

@ -1,5 +1,6 @@
<div *ngIf="account" class="row">
<div class="block col-md-6 col-sm-12">
<div class="margin-content">
<div *ngIf="account" class="row no-gutters">
<div class="block col-md-6 col-sm-12 pr-2">
<div i18n class="small-title">DESCRIPTION</div>
<div class="content" [innerHtml]="getAccountDescription()"></div>
</div>
@ -10,3 +11,4 @@
<div i18n class="content">Joined {{ account.createdAt | date }}</div>
</div>
</div>
</div>

7
client/src/app/+accounts/accounts.component.scss
View File

@ -15,6 +15,13 @@
}
}
.margin-content {
// margin-content is required, but child views have their own margins
// that match views outside the scope of accounts, so we only align
// them with the margins of .sub-menu when required.
margin: 0;
}
.right-buttons {
display: flex;
height: max-content;

6
client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
View File

@ -1,5 +1,6 @@
<div *ngIf="videoChannel" class="row">
<div class="description col-md-6 col-sm-12">
<div class="margin-content">
<div *ngIf="videoChannel" class="row no-gutters">
<div class="description col-md-6 col-sm-12 pr-2">
<div class="block">
<div i18n class="small-title">DESCRIPTION</div>
<div class="content" [innerHtml]="getVideoChannelDescription()"></div>
@ -18,3 +19,4 @@
</div>
</div>
</div>
</div>

2
client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html
View File

@ -1,3 +1,4 @@
<div class="margin-content">
<div i18n class="title-page title-page-single">
Created {{ pagination.totalItems }} playlists
</div>
@ -9,3 +10,4 @@
<my-video-playlist-miniature [playlist]="playlist" [toManage]="false"></my-video-playlist-miniature>
</div>
</div>
</div>

4
client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.scss
View File

@ -1,3 +1,7 @@
.title-page {
margin-top: 0;
}
.video-playlist {
display: flex;
flex-wrap: wrap;

7
client/src/app/+video-channels/video-channels.component.scss
View File

@ -40,6 +40,13 @@
}
}
.margin-content {
// margin-content is required, but child views have their own margins
// that match views outside the scope of accounts, so we only align
// them with the margins of .sub-menu when required.
margin: 0;
}
.right-buttons {
display: flex;
height: max-content;

4
client/src/sass/include/_miniature.scss
View File

@ -185,8 +185,8 @@ $play-overlay-width: 18px;
}
@mixin fluid-videos-miniature-layout {
margin-left: 3vw !important;
margin-right: 3vw !important;
margin-left: $not-expanded-horizontal-margins !important;
margin-right: $not-expanded-horizontal-margins !important;
@media screen and (max-width: $mobile-view) {
width: auto;