aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+accounts
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 /client/src/app/+accounts
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
Diffstat (limited to 'client/src/app/+accounts')
-rw-r--r--client/src/app/+accounts/account-about/account-about.component.html24
-rw-r--r--client/src/app/+accounts/accounts.component.scss7
2 files changed, 20 insertions, 11 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;