aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-06-10 15:51:31 +0200
committerChocobozzz <me@florianbigard.com>2022-06-10 15:51:47 +0200
commitb15fcd49bff880a8246cb48292af3ae8d66f0699 (patch)
tree48808c5bc0491a7c8f11fda3bad24f0d951221ff /client/src/app
parent073367bb651776648792046895b73c2f37e9f532 (diff)
downloadPeerTube-b15fcd49bff880a8246cb48292af3ae8d66f0699.tar.gz
PeerTube-b15fcd49bff880a8246cb48292af3ae8d66f0699.tar.zst
PeerTube-b15fcd49bff880a8246cb48292af3ae8d66f0699.zip
Prefer global icon instead of glyphicon for copy
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+accounts/accounts.component.html2
-rw-r--r--client/src/app/+accounts/accounts.component.scss6
-rw-r--r--client/src/app/+video-channels/video-channels.component.html2
-rw-r--r--client/src/app/+video-channels/video-channels.component.scss6
-rw-r--r--client/src/app/shared/shared-forms/input-toggle-hidden.component.html2
-rw-r--r--client/src/app/shared/shared-forms/input-toggle-hidden.component.scss4
-rw-r--r--client/src/app/shared/shared-icons/global-icon.component.ts1
-rw-r--r--client/src/app/shared/shared-share-modal/video-share.component.html1
-rw-r--r--client/src/app/shared/shared-video-miniature/video-download.component.html28
-rw-r--r--client/src/app/shared/shared-video-miniature/video-download.component.scss7
-rw-r--r--client/src/app/shared/shared-video-miniature/video-download.component.ts4
11 files changed, 28 insertions, 35 deletions
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index d92760ff8..db045b046 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -28,7 +28,7 @@
28 <button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()" 28 <button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()"
29 class="btn btn-outline-secondary btn-sm copy-button" title="Copy account handle" i18n-title 29 class="btn btn-outline-secondary btn-sm copy-button" title="Copy account handle" i18n-title
30 > 30 >
31 <span class="glyphicon glyphicon-duplicate"></span> 31 <my-global-icon iconName="copy"></my-global-icon>
32 </button> 32 </button>
33 </div> 33 </div>
34 34
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss
index a316bd599..e5f86e61e 100644
--- a/client/src/app/+accounts/accounts.component.scss
+++ b/client/src/app/+accounts/accounts.component.scss
@@ -37,7 +37,13 @@ my-user-moderation-dropdown {
37} 37}
38 38
39.copy-button { 39.copy-button {
40 @include margin-left(3px);
41
40 border: 0; 42 border: 0;
43
44 my-global-icon {
45 width: 15px;
46 }
41} 47}
42 48
43.account-info { 49.account-info {
diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index 780db79b0..1b9dbe7b9 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -67,7 +67,7 @@
67 <button [cdkCopyToClipboard]="videoChannel.nameWithHostForced" (click)="activateCopiedMessage()" 67 <button [cdkCopyToClipboard]="videoChannel.nameWithHostForced" (click)="activateCopiedMessage()"
68 class="btn btn-outline-secondary btn-sm copy-button" title="Copy channel handle" i18n-title 68 class="btn btn-outline-secondary btn-sm copy-button" title="Copy channel handle" i18n-title
69 > 69 >
70 <span class="glyphicon glyphicon-duplicate"></span> 70 <my-global-icon iconName="copy"></my-global-icon>
71 </button> 71 </button>
72 </div> 72 </div>
73 73
diff --git a/client/src/app/+video-channels/video-channels.component.scss b/client/src/app/+video-channels/video-channels.component.scss
index c00dacae5..945d9a13d 100644
--- a/client/src/app/+video-channels/video-channels.component.scss
+++ b/client/src/app/+video-channels/video-channels.component.scss
@@ -150,7 +150,13 @@
150} 150}
151 151
152.copy-button { 152.copy-button {
153 @include margin-left(3px);
154
153 border: 0; 155 border: 0;
156
157 my-global-icon {
158 width: 15px;
159 }
154} 160}
155 161
156@media screen and (max-width: 1400px) { 162@media screen and (max-width: 1400px) {
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.html b/client/src/app/shared/shared-forms/input-toggle-hidden.component.html
index e5edb6c97..f7f9ce403 100644
--- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.html
+++ b/client/src/app/shared/shared-forms/input-toggle-hidden.component.html
@@ -13,7 +13,7 @@
13 *ngIf="withCopy" [cdkCopyToClipboard]="input.value" (click)="activateCopiedMessage()" type="button" 13 *ngIf="withCopy" [cdkCopyToClipboard]="input.value" (click)="activateCopiedMessage()" type="button"
14 class="btn btn-outline-secondary text-uppercase" i18n-title title="Copy" 14 class="btn btn-outline-secondary text-uppercase" i18n-title title="Copy"
15 > 15 >
16 <span class="glyphicon glyphicon-duplicate"></span> 16 <my-global-icon iconName="copy"></my-global-icon>
17 <span class="copy-text">Copy</span> 17 <span class="copy-text">Copy</span>
18 </button> 18 </button>
19</div> 19</div>
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss b/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
index 02a8d7d0e..cc1646a69 100644
--- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
+++ b/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
@@ -11,6 +11,10 @@ input {
11 font-size: 15px; 11 font-size: 15px;
12} 12}
13 13
14my-global-icon {
15 width: 18px;
16}
17
14.copy-text { 18.copy-text {
15 font-size: 14px; 19 font-size: 14px;
16 margin-left: 5px; 20 margin-left: 5px;
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index ba23edde0..3a0d57691 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -21,6 +21,7 @@ const icons = {
21 local: require('!!raw-loader?!../../../assets/images/misc/local.svg').default, 21 local: require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
22 22
23 // feather icons 23 // feather icons
24 copy: require('!!raw-loader?!../../../assets/images/feather/copy.svg').default,
24 flag: require('!!raw-loader?!../../../assets/images/feather/flag.svg').default, 25 flag: require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
25 playlists: require('!!raw-loader?!../../../assets/images/feather/list.svg').default, 26 playlists: require('!!raw-loader?!../../../assets/images/feather/list.svg').default,
26 syndication: require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default, 27 syndication: require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default,
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.html b/client/src/app/shared/shared-share-modal/video-share.component.html
index a6b8576a1..572c03129 100644
--- a/client/src/app/shared/shared-share-modal/video-share.component.html
+++ b/client/src/app/shared/shared-share-modal/video-share.component.html
@@ -25,7 +25,6 @@
25 25
26 <ng-template ngbNavContent> 26 <ng-template ngbNavContent>
27 <div class="nav-content"> 27 <div class="nav-content">
28
29 <my-input-toggle-hidden [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> 28 <my-input-toggle-hidden [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden>
30 </div> 29 </div>
31 </ng-template> 30 </ng-template>
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.html b/client/src/app/shared/shared-video-miniature/video-download.component.html
index 9123d2a5a..bf971229e 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.html
@@ -28,16 +28,10 @@
28 28
29 <ng-template ngbNavContent> 29 <ng-template ngbNavContent>
30 <div class="nav-content"> 30 <div class="nav-content">
31 <div class="input-group"> 31 <my-input-toggle-hidden
32 <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="getLink()" /> 32 *ngIf="!isConfidentialVideo()"
33 33 [show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()"
34 <button 34 ></my-input-toggle-hidden>
35 *ngIf="!isConfidentialVideo()" type="button" class="btn btn-outline-secondary"
36 [cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()"
37 >
38 <span class="glyphicon glyphicon-duplicate"></span>
39 </button>
40 </div>
41 </div> 35 </div>
42 </ng-template> 36 </ng-template>
43 </ng-container> 37 </ng-container>
@@ -54,16 +48,10 @@
54 48
55 <ng-template ngbNavContent> 49 <ng-template ngbNavContent>
56 <div class="nav-content"> 50 <div class="nav-content">
57 <div class="input-group"> 51 <my-input-toggle-hidden
58 <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="getLink()" /> 52 *ngIf="!isConfidentialVideo()"
59 53 [show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()"
60 <button 54 ></my-input-toggle-hidden>
61 *ngIf="!isConfidentialVideo()" type="button" class="btn btn-outline-secondary"
62 [cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()"
63 >
64 <span class="glyphicon glyphicon-duplicate"></span>
65 </button>
66 </div>
67 </div> 55 </div>
68 </ng-template> 56 </ng-template>
69 </ng-container> 57 </ng-container>
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.scss b/client/src/app/shared/shared-video-miniature/video-download.component.scss
index 04d5eb560..bd42f4813 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.scss
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.scss
@@ -5,13 +5,6 @@
5 margin-top: 30px; 5 margin-top: 30px;
6} 6}
7 7
8.input-group > input {
9 @include peertube-input-text(auto);
10
11 font-size: 14px;
12 padding: 0 5px;
13}
14
15.advanced-filters-button { 8.advanced-filters-button {
16 display: flex; 9 display: flex;
17 justify-content: center; 10 justify-content: center;
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.ts b/client/src/app/shared/shared-video-miniature/video-download.component.ts
index 5328f5170..bbda39c2d 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.ts
@@ -193,10 +193,6 @@ export class VideoDownloadComponent {
193 return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL 193 return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL
194 } 194 }
195 195
196 activateCopiedMessage () {
197 this.notifier.success($localize`Copied`)
198 }
199
200 switchToType (type: DownloadType) { 196 switchToType (type: DownloadType) {
201 this.type = type 197 this.type = type
202 } 198 }