aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+videos/+video-watch
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+videos/+video-watch')
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html4
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss5
-rw-r--r--client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html5
-rw-r--r--client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss23
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html14
5 files changed, 16 insertions, 35 deletions
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>