diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-24 15:27:15 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-05-24 15:27:15 +0200 |
commit | d0fbc9fd0a29c37f3ff9b99030351e90b276fe7d (patch) | |
tree | fa29fcfd704cbc56c7bc3e3e1c15d84ea0f4dc61 /client/src/app/+videos | |
parent | 25ea1d85e155382367d11036617848fe69a1e6a4 (diff) | |
download | PeerTube-d0fbc9fd0a29c37f3ff9b99030351e90b276fe7d.tar.gz PeerTube-d0fbc9fd0a29c37f3ff9b99030351e90b276fe7d.tar.zst PeerTube-d0fbc9fd0a29c37f3ff9b99030351e90b276fe7d.zip |
Fix lint
Diffstat (limited to 'client/src/app/+videos')
7 files changed, 24 insertions, 47 deletions
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index b0da84979..b607dabe9 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html | |||
@@ -22,7 +22,7 @@ | |||
22 | </div> | 22 | </div> |
23 | 23 | ||
24 | <div class="form-group"> | 24 | <div class="form-group"> |
25 | <label i18n class="label-tags">Tags</label> | 25 | <label for="label-tags" i18n class="label-tags">Tags</label> |
26 | 26 | ||
27 | <my-help> | 27 | <my-help> |
28 | <ng-template ptTemplate="customHtml"> | 28 | <ng-template ptTemplate="customHtml"> |
@@ -170,10 +170,10 @@ | |||
170 | <div class="captions"> | 170 | <div class="captions"> |
171 | 171 | ||
172 | <div class="captions-header"> | 172 | <div class="captions-header"> |
173 | <a (click)="openAddCaptionModal()" class="create-caption"> | 173 | <button (click)="openAddCaptionModal()" class="peertube-create-button"> |
174 | <my-global-icon iconName="add" aria-hidden="true"></my-global-icon> | 174 | <my-global-icon iconName="add" aria-hidden="true"></my-global-icon> |
175 | <ng-container i18n>Add another caption</ng-container> | 175 | <ng-container i18n>Add another caption</ng-container> |
176 | </a> | 176 | </button> |
177 | </div> | 177 | </div> |
178 | 178 | ||
179 | <div class="form-group" *ngFor="let videoCaption of videoCaptions"> | 179 | <div class="form-group" *ngFor="let videoCaption of videoCaptions"> |
@@ -187,8 +187,8 @@ | |||
187 | 187 | ||
188 | <div i18n class="caption-entry-state">Already uploaded on {{ videoCaption.updatedAt | date }} ✔</div> | 188 | <div i18n class="caption-entry-state">Already uploaded on {{ videoCaption.updatedAt | date }} ✔</div> |
189 | 189 | ||
190 | <span i18n class="caption-entry-edit" (click)="openEditCaptionModal(videoCaption)">Edit</span> | 190 | <button i18n class="caption-entry-edit" (click)="openEditCaptionModal(videoCaption)">Edit</button> |
191 | <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</span> | 191 | <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</button> |
192 | </ng-container> | 192 | </ng-container> |
193 | 193 | ||
194 | <ng-container *ngIf="videoCaption.action === 'CREATE'"> | 194 | <ng-container *ngIf="videoCaption.action === 'CREATE'"> |
@@ -196,7 +196,7 @@ | |||
196 | 196 | ||
197 | <div i18n class="caption-entry-state caption-entry-state-create">Will be created on update</div> | 197 | <div i18n class="caption-entry-state caption-entry-state-create">Will be created on update</div> |
198 | 198 | ||
199 | <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel create</span> | 199 | <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel create</button> |
200 | </ng-container> | 200 | </ng-container> |
201 | 201 | ||
202 | <ng-container *ngIf="videoCaption.action === 'UPDATE'"> | 202 | <ng-container *ngIf="videoCaption.action === 'UPDATE'"> |
@@ -204,7 +204,7 @@ | |||
204 | 204 | ||
205 | <div i18n class="caption-entry-state caption-entry-state-create">Will be edited on update</div> | 205 | <div i18n class="caption-entry-state caption-entry-state-create">Will be edited on update</div> |
206 | 206 | ||
207 | <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel edition</span> | 207 | <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel edition</button> |
208 | </ng-container> | 208 | </ng-container> |
209 | 209 | ||
210 | <ng-container *ngIf="videoCaption.action === 'REMOVE'"> | 210 | <ng-container *ngIf="videoCaption.action === 'REMOVE'"> |
@@ -212,7 +212,7 @@ | |||
212 | 212 | ||
213 | <div i18n class="caption-entry-state caption-entry-state-delete">Will be deleted on update</div> | 213 | <div i18n class="caption-entry-state caption-entry-state-delete">Will be deleted on update</div> |
214 | 214 | ||
215 | <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel deletion</span> | 215 | <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel deletion</button> |
216 | </ng-container> | 216 | </ng-container> |
217 | </div> | 217 | </div> |
218 | </div> | 218 | </div> |
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss index a8075cc6d..1c6f7f5ab 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss | |||
@@ -29,10 +29,6 @@ my-peertube-checkbox { | |||
29 | margin-bottom: 1rem; | 29 | margin-bottom: 1rem; |
30 | } | 30 | } |
31 | 31 | ||
32 | .create-caption { | ||
33 | @include create-button; | ||
34 | } | ||
35 | |||
36 | .caption-entry { | 32 | .caption-entry { |
37 | display: flex; | 33 | display: flex; |
38 | height: 40px; | 34 | height: 40px; |
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html index e27942e66..a003a10eb 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html | |||
@@ -64,7 +64,7 @@ | |||
64 | (timestampClicked)="handleTimestampClicked($event)" | 64 | (timestampClicked)="handleTimestampClicked($event)" |
65 | [redraftValue]="commentReplyRedraftValue" | 65 | [redraftValue]="commentReplyRedraftValue" |
66 | > | 66 | > |
67 | <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies mb-2"> | 67 | <button *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies mb-2 button-unstyle"> |
68 | <span class="chevron-down"></span> | 68 | <span class="chevron-down"></span> |
69 | 69 | ||
70 | <ng-container *ngIf="comment.totalRepliesFromVideoAuthor > 0; then hasAuthorComments; else noAuthorComments"></ng-container> | 70 | <ng-container *ngIf="comment.totalRepliesFromVideoAuthor > 0; then hasAuthorComments; else noAuthorComments"></ng-container> |
@@ -81,7 +81,7 @@ | |||
81 | <ng-template i18n #noAuthorComments>View {comment.totalReplies, plural, =1 {1 reply} other {{{ comment.totalReplies }} replies}}</ng-template> | 81 | <ng-template i18n #noAuthorComments>View {comment.totalReplies, plural, =1 {1 reply} other {{{ comment.totalReplies }} replies}}</ng-template> |
82 | 82 | ||
83 | <my-loader size="sm" class="ms-1" [loading]="threadLoading[comment.id]"></my-loader> | 83 | <my-loader size="sm" class="ms-1" [loading]="threadLoading[comment.id]"></my-loader> |
84 | </div> | 84 | </button> |
85 | </my-video-comment> | 85 | </my-video-comment> |
86 | 86 | ||
87 | </div> | 87 | </div> |
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss index 5001ad168..7720fe43b 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss | |||
@@ -24,16 +24,11 @@ | |||
24 | @include margin-left(5px); | 24 | @include margin-left(5px); |
25 | 25 | ||
26 | display: inline-block; | 26 | display: inline-block; |
27 | opacity: 0; | ||
28 | transition: ease-in .2s opacity; | 27 | transition: ease-in .2s opacity; |
29 | width: 12px; | 28 | width: 12px; |
30 | position: relative; | 29 | position: relative; |
31 | top: -3px; | 30 | top: -3px; |
32 | } | 31 | } |
33 | |||
34 | &:hover my-feed { | ||
35 | opacity: 1; | ||
36 | } | ||
37 | } | 32 | } |
38 | 33 | ||
39 | #dropdown-sort-comments { | 34 | #dropdown-sort-comments { |
diff --git a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html index 7677ae836..93c4ba7a7 100644 --- a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html +++ b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html | |||
@@ -6,10 +6,11 @@ | |||
6 | the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. | 6 | the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. |
7 | </ng-container> | 7 | </ng-container> |
8 | </span> | 8 | </span> |
9 | |||
9 | <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube#privacy">More information</a> | 10 | <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube#privacy">More information</a> |
10 | </div> | 11 | </div> |
11 | 12 | ||
12 | <div i18n class="privacy-concerns-button privacy-concerns-okay" (click)="acceptedPrivacyConcern()"> | 13 | <button i18n class="ms-2 peertube-button orange-button" (click)="acceptedPrivacyConcern()"> |
13 | OK | 14 | OK |
14 | </div> | 15 | </button> |
15 | </div> | 16 | </div> |
diff --git a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss index a6479c7ec..f7f9dfd2f 100644 --- a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss +++ b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss | |||
@@ -50,31 +50,10 @@ a { | |||
50 | transition: color 0.3s; | 50 | transition: color 0.3s; |
51 | 51 | ||
52 | &:hover { | 52 | &:hover { |
53 | color: #fff; | 53 | color: pvar(--mainBackgroundColor); |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | .privacy-concerns-button { | ||
58 | @include margin-left(auto); | ||
59 | |||
60 | padding: 5px 8px 5px 7px; | ||
61 | border-radius: 3px; | ||
62 | white-space: nowrap; | ||
63 | cursor: pointer; | ||
64 | transition: background-color 0.3s; | ||
65 | font-weight: $font-semibold; | ||
66 | |||
67 | &:hover { | ||
68 | background-color: #000; | ||
69 | } | ||
70 | } | ||
71 | |||
72 | .privacy-concerns-okay { | ||
73 | @include margin-left(10px); | ||
74 | |||
75 | background-color: pvar(--mainColor); | ||
76 | } | ||
77 | |||
78 | @media screen and (max-width: 1300px) { | 57 | @media screen and (max-width: 1300px) { |
79 | .privacy-concerns { | 58 | .privacy-concerns { |
80 | font-size: 12px; | 59 | font-size: 12px; |
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html index d847daff7..9db3018e6 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html | |||
@@ -6,14 +6,20 @@ | |||
6 | myTimestampRouteTransformer | 6 | myTimestampRouteTransformer |
7 | ></div> | 7 | ></div> |
8 | 8 | ||
9 | <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()"> | 9 | <button |
10 | *ngIf="completeDescriptionShown === false && video.description?.length >= 250" | ||
11 | (click)="showMoreDescription()" class="video-info-description-more button-unstyle" | ||
12 | > | ||
10 | <ng-container i18n>Show more</ng-container> | 13 | <ng-container i18n>Show more</ng-container> |
11 | <span *ngIf="descriptionLoading === false" class="chevron-down"></span> | 14 | <span *ngIf="descriptionLoading === false" class="chevron-down"></span> |
12 | <my-loader size="sm" class="description-loading" [loading]="descriptionLoading"></my-loader> | 15 | <my-loader size="sm" class="description-loading" [loading]="descriptionLoading"></my-loader> |
13 | </div> | 16 | </button> |
14 | 17 | ||
15 | <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-info-description-more"> | 18 | <button |
19 | *ngIf="completeDescriptionShown === true" | ||
20 | (click)="showLessDescription()" class="video-info-description-more button-unstyle" | ||
21 | > | ||
16 | <ng-container i18n>Show less</ng-container> | 22 | <ng-container i18n>Show less</ng-container> |
17 | <span *ngIf="descriptionLoading === false" class="chevron-up"></span> | 23 | <span *ngIf="descriptionLoading === false" class="chevron-up"></span> |
18 | </div> | 24 | </button> |
19 | </div> | 25 | </div> |