aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/package.json1
-rw-r--r--client/src/app/header/header.component.scss5
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment-add.component.html3
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment-add.component.scss4
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html298
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss19
-rw-r--r--client/src/app/videos/+video-watch/video-watch.module.ts4
-rw-r--r--client/src/sass/application.scss7
-rw-r--r--client/yarn.lock6
9 files changed, 193 insertions, 154 deletions
diff --git a/client/package.json b/client/package.json
index 4b24d5e31..26583faba 100644
--- a/client/package.json
+++ b/client/package.json
@@ -92,6 +92,7 @@
92 "ngx-clipboard": "11.1.3", 92 "ngx-clipboard": "11.1.3",
93 "ngx-pipes": "^2.1.7", 93 "ngx-pipes": "^2.1.7",
94 "ngx-qrcode2": "^0.0.9", 94 "ngx-qrcode2": "^0.0.9",
95 "ngx-textarea-autosize": "^2.0.0",
95 "node-sass": "^4.9.3", 96 "node-sass": "^4.9.3",
96 "npm-font-source-sans-pro": "^1.0.2", 97 "npm-font-source-sans-pro": "^1.0.2",
97 "path-browserify": "^1.0.0", 98 "path-browserify": "^1.0.0",
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss
index 6ce92fc22..8251ec1b5 100644
--- a/client/src/app/header/header.component.scss
+++ b/client/src/app/header/header.component.scss
@@ -3,6 +3,7 @@
3 3
4#search-video { 4#search-video {
5 @include peertube-input-text($search-input-width); 5 @include peertube-input-text($search-input-width);
6 padding-left: 10px;
6 margin-right: 15px; 7 margin-right: 15px;
7 padding-right: 40px; // For the search icon 8 padding-right: 40px; // For the search icon
8 9
@@ -10,6 +11,10 @@
10 color: #000; 11 color: #000;
11 } 12 }
12 13
14 &:focus::placeholder {
15 opacity: 0 !important;
16 }
17
13 @media screen and (max-width: 800px) { 18 @media screen and (max-width: 800px) {
14 width: calc(100% - 150px); 19 width: calc(100% - 150px);
15 } 20 }
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 8ea7f04ed..f65a88d20 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -3,7 +3,8 @@
3 <img [src]="user.accountAvatarUrl" alt="Avatar" /> 3 <img [src]="user.accountAvatarUrl" alt="Avatar" />
4 4
5 <div class="form-group"> 5 <div class="form-group">
6 <textarea i18n-placeholder placeholder="Add comment..." formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }" 6 <textarea i18n-placeholder placeholder="Add comment..." autosize
7 formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
7 (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea> 8 (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
8 9
9 </textarea> 10 </textarea>
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss b/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss
index dbce744bf..a55e743fb 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss
@@ -22,6 +22,10 @@ form {
22 22
23 textarea { 23 textarea {
24 @include peertube-textarea(100%, 60px); 24 @include peertube-textarea(100%, 60px);
25
26 &:focus::placeholder {
27 opacity: 0;
28 }
25 } 29 }
26 } 30 }
27} 31}
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index e9c79741e..333c9d11b 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -26,180 +26,198 @@
26 </div> 26 </div>
27 27
28 <!-- Video information --> 28 <!-- Video information -->
29 <div *ngIf="video" class="margin-content video-bottom"> 29 <div *ngIf="video" class="container video-bottom">
30 <div class="video-info"> 30 <div class="row fullWidth">
31 <div class="video-info-first-row"> 31 <div class="col-12 col-md-9 video-info">
32 <div> 32 <div class="video-info-first-row">
33 <div class="video-info-name">{{ video.name }}</div> 33 <div>
34 34 <div class="d-block d-sm-none"> <!-- only shown on small devices, has its conterpart for larger viewports below -->
35 <div i18n class="video-info-date-views"> 35 <div class="video-info-name">{{ video.name }}</div>
36 {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views 36
37 </div> 37 <div i18n class="video-info-date-views">
38 38 Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
39 <div class="video-info-channel"> 39 </div>
40 <a [routerLink]="[ '/video-channels', video.channel.name ]" i18n-title title="Go the channel page">
41 {{ video.channel.displayName }}
42
43 <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
44 </a>
45
46 <my-subscribe-button [videoChannel]="video.channel" size="small"></my-subscribe-button>
47 </div>
48
49 <div class="video-info-by">
50 <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Go to the account page">
51 <span i18n>By {{ video.byAccount }}</span>
52 <img [src]="video.accountAvatarUrl" alt="Account avatar" />
53 </a>
54
55 <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there."></my-help>
56 </div>
57 </div>
58
59 <div class="video-actions-rates">
60 <div class="video-actions">
61 <div
62 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
63 class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
64 >
65 <span class="icon icon-like" i18n-title title="Like this video" ></span>
66 </div> 40 </div>
67 41
68 <div 42 <div class="d-flex justify-content-between align-items-sm-end">
69 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()" 43 <div class="d-none d-sm-block">
70 class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'" 44 <div class="video-info-name">{{ video.name }}</div>
71 > 45
72 <span class="icon icon-dislike" i18n-title title="Dislike this video"></span> 46 <div i18n class="video-info-date-views">
47 Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
48 </div>
49 </div>
50
51 <div class="video-actions-rates">
52 <div class="video-actions fullWidth justify-content-end">
53 <div
54 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
55 class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
56 >
57 <span class="icon icon-like" i18n-title title="Like this video" ></span>
58 </div>
59
60 <div
61 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
62 class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
63 >
64 <span class="icon icon-dislike" i18n-title title="Dislike this video"></span>
65 </div>
66
67 <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
68 <span class="icon icon-support"></span>
69 <span class="icon-text" i18n>Support</span>
70 </div>
71
72 <div (click)="showShareModal()" class="action-button action-button-share" role="button">
73 <span class="icon icon-share"></span>
74 <span class="icon-text" i18n>Share</span>
75 </div>
76
77 <div class="action-more" ngbDropdown placement="top" role="button">
78 <div class="action-button" ngbDropdownToggle role="button">
79 <span class="icon icon-more"></span>
80 </div>
81
82 <div ngbDropdownMenu>
83 <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)">
84 <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container>
85 </a>
86
87 <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)">
88 <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container>
89 </a>
90
91 <a *ngIf="isVideoUpdatable()" class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]">
92 <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container>
93 </a>
94
95 <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)">
96 <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container>
97 </a>
98
99 <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)">
100 <span class="icon icon-unblacklist"></span> <ng-container i18n>Unblacklist</ng-container>
101 </a>
102
103 <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)">
104 <span class="icon icon-delete"></span> <ng-container i18n>Delete</ng-container>
105 </a>
106 </div>
107 </div>
108 </div>
109
110 <div
111 class="video-info-likes-dislikes-bar"
112 *ngIf="video.likes !== 0 || video.dislikes !== 0"
113 placement="bottom"
114 [ngbTooltip]="likesBarTooltipText">
115 <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
116 </div>
117 </div>
73 </div> 118 </div>
74 119
75 <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
76 <span class="icon icon-support"></span>
77 <span class="icon-text" i18n>Support</span>
78 </div>
79 120
80 <div (click)="showShareModal()" class="action-button action-button-share" role="button"> 121 <div class="pt-3 border-top video-info-channel">
81 <span class="icon icon-share"></span> 122 <a [routerLink]="[ '/video-channels', video.channel.name ]" i18n-title title="Go the channel page">
82 <span class="icon-text" i18n>Share</span> 123 {{ video.channel.displayName }}
83 </div>
84 124
85 <div class="action-more" ngbDropdown placement="top" role="button"> 125 <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
86 <div class="action-button" ngbDropdownToggle role="button"> 126 </a>
87 <span class="icon icon-more"></span>
88 </div>
89 127
90 <div ngbDropdownMenu> 128 <my-subscribe-button [videoChannel]="video.channel" size="small"></my-subscribe-button>
91 <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)"> 129 </div>
92 <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container>
93 </a>
94 130
95 <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)"> 131 <div class="video-info-by">
96 <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container> 132 <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Go to the account page">
97 </a> 133 <span i18n>By {{ video.byAccount }}</span>
134 <img [src]="video.accountAvatarUrl" alt="Account avatar" />
135 </a>
98 136
99 <a *ngIf="isVideoUpdatable()" class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]"> 137 <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there."></my-help>
100 <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container> 138 </div>
101 </a> 139 </div>
102 140
103 <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)"> 141 </div>
104 <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container>
105 </a>
106 142
107 <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)"> 143 <div class="video-info-description">
108 <span class="icon icon-unblacklist"></span> <ng-container i18n>Unblacklist</ng-container> 144 <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div>
109 </a>
110 145
111 <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)"> 146 <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()">
112 <span class="icon icon-delete"></span> <ng-container i18n>Delete</ng-container> 147 <ng-container i18n>Show more</ng-container>
113 </a> 148 <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-down"></span>
114 </div> 149 <my-loader class="description-loading" [loading]="descriptionLoading"></my-loader>
115 </div>
116 </div> 150 </div>
117 151
118 <div 152 <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-info-description-more">
119 class="video-info-likes-dislikes-bar" 153 <ng-container i18n>Show less</ng-container>
120 *ngIf="video.likes !== 0 || video.dislikes !== 0" [ngbTooltip]="likesBarTooltipText"> 154 <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-up"></span>
121 <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
122 </div> 155 </div>
123 </div> 156 </div>
124 </div>
125 157
126 <div class="video-info-description"> 158 <div class="video-attributes">
127 <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div> 159 <div class="video-attribute">
160 <span i18n class="video-attribute-label">Privacy</span>
161 <span class="video-attribute-value">{{ video.privacy.label }}</span>
162 </div>
128 163
129 <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()"> 164 <div class="video-attribute">
130 <ng-container i18n>Show more</ng-container> 165 <span i18n class="video-attribute-label">Category</span>
131 <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-down"></span> 166 <span *ngIf="!video.category.id" class="video-attribute-value">{{ video.category.label }}</span>
132 <my-loader class="description-loading" [loading]="descriptionLoading"></my-loader> 167 <a
133 </div> 168 *ngIf="video.category.id" class="video-attribute-value"
169 [routerLink]="[ '/search' ]" [queryParams]="{ categoryOneOf: [ video.category.id ] }"
170 >{{ video.category.label }}</a>
171 </div>
134 172
135 <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-info-description-more"> 173 <div class="video-attribute">
136 <ng-container i18n>Show less</ng-container> 174 <span i18n class="video-attribute-label">Licence</span>
137 <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-up"></span> 175 <span *ngIf="!video.licence.id" class="video-attribute-value">{{ video.licence.label }}</span>
138 </div> 176 <a
139 </div> 177 *ngIf="video.licence.id" class="video-attribute-value"
178 [routerLink]="[ '/search' ]" [queryParams]="{ licenceOneOf: [ video.licence.id ] }"
179 >{{ video.licence.label }}</a>
180 </div>
140 181
141 <div class="video-attributes"> 182 <div class="video-attribute">
142 <div class="video-attribute"> 183 <span i18n class="video-attribute-label">Language</span>
143 <span i18n class="video-attribute-label">Privacy</span> 184 <span *ngIf="!video.language.id" class="video-attribute-value">{{ video.language.label }}</span>
144 <span class="video-attribute-value">{{ video.privacy.label }}</span> 185 <a
145 </div> 186 *ngIf="video.language.id" class="video-attribute-value"
187 [routerLink]="[ '/search' ]" [queryParams]="{ languageOneOf: [ video.language.id ] }"
188 >{{ video.language.label }}</a>
189 </div>
146 190
147 <div class="video-attribute"> 191 <div class="video-attribute video-attribute-tags">
148 <span i18n class="video-attribute-label">Category</span> 192 <span i18n class="video-attribute-label">Tags</span>
149 <span *ngIf="!video.category.id" class="video-attribute-value">{{ video.category.label }}</span> 193 <a
150 <a 194 *ngFor="let tag of getVideoTags()"
151 *ngIf="video.category.id" class="video-attribute-value" 195 class="video-attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
152 [routerLink]="[ '/search' ]" [queryParams]="{ categoryOneOf: [ video.category.id ] }" 196 >{{ tag }}</a>
153 >{{ video.category.label }}</a> 197 </div>
154 </div> 198 </div>
155 199
156 <div class="video-attribute"> 200 <my-video-comments [video]="video" [user]="user"></my-video-comments>
157 <span i18n class="video-attribute-label">Licence</span> 201 </div>
158 <span *ngIf="!video.licence.id" class="video-attribute-value">{{ video.licence.label }}</span>
159 <a
160 *ngIf="video.licence.id" class="video-attribute-value"
161 [routerLink]="[ '/search' ]" [queryParams]="{ licenceOneOf: [ video.licence.id ] }"
162 >{{ video.licence.label }}</a>
163 </div>
164 202
165 <div class="video-attribute"> 203 <div class="ml-3 ml-sm-0 col-12 col-md-3 other-videos">
166 <span i18n class="video-attribute-label">Language</span> 204 <div i18n class="title-page title-page-single">
167 <span *ngIf="!video.language.id" class="video-attribute-value">{{ video.language.label }}</span> 205 Other videos
168 <a
169 *ngIf="video.language.id" class="video-attribute-value"
170 [routerLink]="[ '/search' ]" [queryParams]="{ languageOneOf: [ video.language.id ] }"
171 >{{ video.language.label }}</a>
172 </div> 206 </div>
173 207
174 <div class="video-attribute video-attribute-tags"> 208 <div *ngFor="let video of otherVideosDisplayed">
175 <span i18n class="video-attribute-label">Tags</span> 209 <my-video-miniature [video]="video" [user]="user"></my-video-miniature>
176 <a
177 *ngFor="let tag of getVideoTags()"
178 class="video-attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
179 >{{ tag }}</a>
180 </div> 210 </div>
181 </div> 211 </div>
182
183 <my-video-comments [video]="video" [user]="user"></my-video-comments>
184 </div>
185
186 <div class="other-videos">
187 <div i18n class="title-page title-page-single">
188 Other videos
189 </div>
190
191 <div *ngFor="let video of otherVideosDisplayed">
192 <my-video-miniature [video]="video" [user]="user"></my-video-miniature>
193 </div>
194 </div> 212 </div>
195 </div> 213 </div>
196 214
197 215
198 <div class="privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false"> 216 <div class="privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
199 <strong i18n>Friendly Reminder:</strong>
200 <div class="privacy-concerns-text"> 217 <div class="privacy-concerns-text">
218 <strong i18n>Friendly Reminder: </strong>
201 <ng-container i18n> 219 <ng-container i18n>
202 The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. 220 the sharing system used by this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
203 </ng-container> 221 </ng-container>
204 <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a> 222 <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a>
205 </div> 223 </div>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index 9bd510c9f..afd846af3 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -76,12 +76,9 @@
76 76
77.video-bottom { 77.video-bottom {
78 margin-top: 40px; 78 margin-top: 40px;
79 display: flex;
80 flex-grow: 1;
81 79
82 .video-info { 80 .video-info {
83 flex-grow: 1; 81 flex-grow: 1;
84 margin-right: 40px;
85 // Set min width for flex item 82 // Set min width for flex item
86 min-width: 1px; 83 min-width: 1px;
87 84
@@ -284,10 +281,13 @@
284 } 281 }
285 282
286 .video-info-likes-dislikes-bar { 283 .video-info-likes-dislikes-bar {
287 height: 5px; 284 $likes-bar-height: 2px;
285 height: $likes-bar-height;
286 margin-top: -$likes-bar-height;
288 width: 186px; 287 width: 186px;
289 background-color: #E5E5E5; 288 background-color: #E5E5E5;
290 margin-top: 25px; 289 position: relative;
290 top: 10px;
291 291
292 .likes-bar { 292 .likes-bar {
293 height: 100%; 293 height: 100%;
@@ -439,19 +439,14 @@
439@media screen and (max-width: 1600px) { 439@media screen and (max-width: 1600px) {
440 .video-bottom { 440 .video-bottom {
441 .video-info { 441 .video-info {
442 margin-right: 20px;
443
444 .video-info-first-row { 442 .video-info-first-row {
445 flex-direction: column; 443 flex-direction: column;
446 margin-bottom: 30px; 444 margin-bottom: 20px;
447 445
448 .video-actions-rates { 446 .video-actions-rates {
449 margin-top: 20px; 447 margin-top: 20px;
448 margin-bottom: 10px;
450 align-items: start; 449 align-items: start;
451
452 .video-info-likes-dislikes-bar {
453 margin-top: 10px;
454 }
455 } 450 }
456 } 451 }
457 452
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts
index 57e3c9c78..7920147b2 100644
--- a/client/src/app/videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/videos/+video-watch/video-watch.module.ts
@@ -16,6 +16,7 @@ import { VideoWatchComponent } from './video-watch.component'
16import { NgxQRCodeModule } from 'ngx-qrcode2' 16import { NgxQRCodeModule } from 'ngx-qrcode2'
17import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' 17import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
18import { VideoBlacklistComponent } from '@app/videos/+video-watch/modal/video-blacklist.component' 18import { VideoBlacklistComponent } from '@app/videos/+video-watch/modal/video-blacklist.component'
19import { TextareaAutosizeModule } from 'ngx-textarea-autosize'
19 20
20@NgModule({ 21@NgModule({
21 imports: [ 22 imports: [
@@ -23,7 +24,8 @@ import { VideoBlacklistComponent } from '@app/videos/+video-watch/modal/video-bl
23 SharedModule, 24 SharedModule,
24 ClipboardModule, 25 ClipboardModule,
25 NgbTooltipModule, 26 NgbTooltipModule,
26 NgxQRCodeModule 27 NgxQRCodeModule,
28 TextareaAutosizeModule
27 ], 29 ],
28 30
29 declarations: [ 31 declarations: [
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 9c4811fec..21df23c18 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -61,6 +61,13 @@ label {
61 border-color: $red !important; 61 border-color: $red !important;
62} 62}
63 63
64.fullWidth {
65 width: 100%;
66 margin-left: auto;
67 margin-right: auto;
68 max-width: initial;
69}
70
64.glyphicon-black { 71.glyphicon-black {
65 color: black; 72 color: black;
66} 73}
diff --git a/client/yarn.lock b/client/yarn.lock
index c79ec3c27..4766def1c 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -5127,6 +5127,12 @@ ngx-qrcode2@^0.0.9:
5127 dependencies: 5127 dependencies:
5128 qrcode "^0.8.2" 5128 qrcode "^0.8.2"
5129 5129
5130ngx-textarea-autosize@^2.0.0:
5131 version "2.0.0"
5132 resolved "https://registry.yarnpkg.com/ngx-textarea-autosize/-/ngx-textarea-autosize-2.0.0.tgz#70d0bf770ebd62b5609c6552233d29c304f92ab8"
5133 dependencies:
5134 tslib "^1.7.1"
5135
5130ngx-window-token@^1.0.0: 5136ngx-window-token@^1.0.0:
5131 version "1.0.0" 5137 version "1.0.0"
5132 resolved "https://registry.yarnpkg.com/ngx-window-token/-/ngx-window-token-1.0.0.tgz#12acb174fbbcffa5c60b3fea5a6ea78cc3304793" 5138 resolved "https://registry.yarnpkg.com/ngx-window-token/-/ngx-window-token-1.0.0.tgz#12acb174fbbcffa5c60b3fea5a6ea78cc3304793"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:01:04 +0000