aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-26 10:22:48 +0200
committerChocobozzz <me@florianbigard.com>2018-04-26 16:18:01 +0200
commit7de6afdf542da6968d3f412df9c3318ba19ad229 (patch)
tree82838f37708185ebb1a7cd2e8e8b5e33850dfe7d /client/src
parent742ccef0b515ca8cc2152d393d7feb9f773f0aae (diff)
downloadPeerTube-7de6afdf542da6968d3f412df9c3318ba19ad229.tar.gz
PeerTube-7de6afdf542da6968d3f412df9c3318ba19ad229.tar.zst
PeerTube-7de6afdf542da6968d3f412df9c3318ba19ad229.zip
Add username near the display name for account pages
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+accounts/accounts.component.html5
-rw-r--r--client/src/app/+video-channels/video-channels.component.html4
-rw-r--r--client/src/app/my-account/my-account-settings/my-account-settings.component.html5
-rw-r--r--client/src/app/my-account/my-account-settings/my-account-settings.component.scss19
-rw-r--r--client/src/sass/include/_mixins.scss19
5 files changed, 43 insertions, 9 deletions
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 549676e5a..c20a7e93e 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -5,7 +5,10 @@
5 <img [src]="account.avatarUrl" alt="Avatar" /> 5 <img [src]="account.avatarUrl" alt="Avatar" />
6 6
7 <div class="actor-info"> 7 <div class="actor-info">
8 <div class="actor-display-name">{{ account.displayName }}</div> 8 <div class="actor-names">
9 <div class="actor-display-name">{{ account.displayName }}</div>
10 <div class="actor-name">{{ account.name }}</div>
11 </div>
9 <div class="actor-followers">{{ account.followersCount }} subscribers</div> 12 <div class="actor-followers">{{ account.followersCount }} subscribers</div>
10 </div> 13 </div>
11 </div> 14 </div>
diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index 098e1eed4..6f14e62a1 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -5,7 +5,9 @@
5 <img [src]="videoChannel.avatarUrl" alt="Avatar" /> 5 <img [src]="videoChannel.avatarUrl" alt="Avatar" />
6 6
7 <div class="actor-info"> 7 <div class="actor-info">
8 <div class="actor-display-name">{{ videoChannel.displayName }}</div> 8 <div class="actor-names">
9 <div class="actor-display-name">{{ videoChannel.displayName }}</div>
10 </div>
9 <div class="actor-followers">{{ videoChannel.followersCount }} subscribers</div> 11 <div class="actor-followers">{{ videoChannel.followersCount }} subscribers</div>
10 </div> 12 </div>
11 </div> 13 </div>
diff --git a/client/src/app/my-account/my-account-settings/my-account-settings.component.html b/client/src/app/my-account/my-account-settings/my-account-settings.component.html
index e655b9d96..0fcc7782e 100644
--- a/client/src/app/my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.html
@@ -2,7 +2,10 @@
2 <img [src]="user.accountAvatarUrl" alt="Avatar" /> 2 <img [src]="user.accountAvatarUrl" alt="Avatar" />
3 3
4 <div class="user-info"> 4 <div class="user-info">
5 <div class="user-info-username">{{ user.username }}</div> 5 <div class="user-info-names">
6 <div class="user-info-display-name">{{ user.account.displayName }}</div>
7 <div class="user-info-username">{{ user.username }}</div>
8 </div>
6 <div class="user-info-followers">{{ user.account?.followersCount }} subscribers</div> 9 <div class="user-info-followers">{{ user.account?.followersCount }} subscribers</div>
7 </div> 10 </div>
8</div> 11</div>
diff --git a/client/src/app/my-account/my-account-settings/my-account-settings.component.scss b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
index 85079d620..ec0d40b93 100644
--- a/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
+++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
@@ -11,9 +11,22 @@
11 } 11 }
12 12
13 .user-info { 13 .user-info {
14 .user-info-username { 14 .user-info-names {
15 font-size: 20px; 15 display: flex;
16 font-weight: $font-bold; 16 align-items: center;
17
18 .user-info-display-name {
19 font-size: 20px;
20 font-weight: $font-bold;
21 }
22
23 .user-info-username {
24 margin-left: 7px;
25 position: relative;
26 top: 2px;
27 font-size: 14px;
28 color: #777272;
29 }
17 } 30 }
18 31
19 .user-info-followers { 32 .user-info-followers {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index c43bd9803..675cccfeb 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -344,9 +344,22 @@
344 flex-direction: column; 344 flex-direction: column;
345 justify-content: center; 345 justify-content: center;
346 346
347 .actor-display-name { 347 .actor-names {
348 font-size: 23px; 348 display: flex;
349 font-weight: $font-bold; 349 align-items: center;
350
351 .actor-display-name {
352 font-size: 23px;
353 font-weight: $font-bold;
354 }
355
356 .actor-name {
357 margin-left: 7px;
358 position: relative;
359 top: 3px;
360 font-size: 14px;
361 color: #777272;
362 }
350 } 363 }
351 364
352 .actor-followers { 365 .actor-followers {