diff options
Diffstat (limited to 'client/src/app/+accounts')
5 files changed, 13 insertions, 3 deletions
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html index 0b22e7526..19a4b3c9c 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html | |||
@@ -22,7 +22,7 @@ | |||
22 | <div class="followers" i18n>{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div> | 22 | <div class="followers" i18n>{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div> |
23 | 23 | ||
24 | <span class="videos-count" *ngIf="getTotalVideosOf(videoChannel) !== undefined" i18n> | 24 | <span class="videos-count" *ngIf="getTotalVideosOf(videoChannel) !== undefined" i18n> |
25 | {getTotalVideosOf(videoChannel), splural, =1 {1 videos} other {{{ getTotalVideosOf(videoChannel) }} videos}} | 25 | {getTotalVideosOf(videoChannel), plural, =1 {1 videos} other {{{ getTotalVideosOf(videoChannel) }} videos}} |
26 | </span> | 26 | </span> |
27 | </div> | 27 | </div> |
28 | 28 | ||
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss index ca4c35cb4..8f1e9deb5 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss | |||
@@ -9,7 +9,7 @@ | |||
9 | .channel { | 9 | .channel { |
10 | max-width: $max-channels-width; | 10 | max-width: $max-channels-width; |
11 | background-color: pvar(--channelBackgroundColor); | 11 | background-color: pvar(--channelBackgroundColor); |
12 | padding: 15px; | 12 | padding: 30px; |
13 | 13 | ||
14 | margin: 30px 0; | 14 | margin: 30px 0; |
15 | 15 | ||
@@ -120,6 +120,10 @@ my-subscribe-button { | |||
120 | } | 120 | } |
121 | 121 | ||
122 | @media screen and (max-width: $mobile-view) { | 122 | @media screen and (max-width: $mobile-view) { |
123 | .channel { | ||
124 | padding: 15px; | ||
125 | } | ||
126 | |||
123 | .channel-avatar-row { | 127 | .channel-avatar-row { |
124 | grid-template-columns: auto auto auto 1fr; | 128 | grid-template-columns: auto auto auto 1fr; |
125 | 129 | ||
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html index e149d0bc6..03d083bb6 100644 --- a/client/src/app/+accounts/accounts.component.html +++ b/client/src/app/+accounts/accounts.component.html | |||
@@ -52,7 +52,7 @@ | |||
52 | <div class="created-at" i18n>Account created on {{ account.createdAt | date }}</div> | 52 | <div class="created-at" i18n>Account created on {{ account.createdAt | date }}</div> |
53 | </div> | 53 | </div> |
54 | 54 | ||
55 | <div *ngIf="!accountDescriptionExpanded" class="show-more" role="button" | 55 | <div *ngIf="hasShowMoreDescription()" class="show-more" role="button" |
56 | (click)="accountDescriptionExpanded = !accountDescriptionExpanded" | 56 | (click)="accountDescriptionExpanded = !accountDescriptionExpanded" |
57 | title="Show the complete description" i18n-title i18n | 57 | title="Show the complete description" i18n-title i18n |
58 | > | 58 | > |
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss index 6a51dd038..80f23ba6f 100644 --- a/client/src/app/+accounts/accounts.component.scss +++ b/client/src/app/+accounts/accounts.component.scss | |||
@@ -62,6 +62,8 @@ my-user-moderation-dropdown, | |||
62 | 62 | ||
63 | .description { | 63 | .description { |
64 | grid-column: 1 / 3; | 64 | grid-column: 1 / 3; |
65 | max-width: 1000px; | ||
66 | word-break: break-word; | ||
65 | } | 67 | } |
66 | 68 | ||
67 | .created-at { | 69 | .created-at { |
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index abee0b9bb..e80314130 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts | |||
@@ -147,6 +147,10 @@ export class AccountsComponent implements OnInit, OnDestroy { | |||
147 | return this.videoChannels.length !== 0 | 147 | return this.videoChannels.length !== 0 |
148 | } | 148 | } |
149 | 149 | ||
150 | hasShowMoreDescription () { | ||
151 | return !this.accountDescriptionExpanded && this.accountDescriptionHTML.length > 100 | ||
152 | } | ||
153 | |||
150 | private async onAccount (account: Account) { | 154 | private async onAccount (account: Account) { |
151 | this.accountFollowerTitle = $localize`${account.followersCount} direct account followers` | 155 | this.accountFollowerTitle = $localize`${account.followersCount} direct account followers` |
152 | 156 | ||