forks/peertube
1
0
Fork 0
Code Releases Activity

Prefer global icon instead of glyphicon for copy

Browse source
This commit is contained in:
Chocobozzz 2022-06-10 15:51:31 +02:00
parent 073367bb65
commit b15fcd49bf
No known key found for this signature in database
GPG key ID: 583A612D890159BE
12 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/app/+accounts/accounts.component.html
View file

@ -28,7 +28,7 @@
<button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()"
class="btn btn-outline-secondary btn-sm copy-button" title="Copy account handle" i18n-title
>
<span class="glyphicon glyphicon-duplicate"></span>
<my-global-icon iconName="copy"></my-global-icon>
</button>
</div>

6
client/src/app/+accounts/accounts.component.scss
View file

@ -37,7 +37,13 @@ my-user-moderation-dropdown {
}
.copy-button {
@include margin-left(3px);
border: 0;
my-global-icon {
width: 15px;
}
}
.account-info {

2
client/src/app/+video-channels/video-channels.component.html
View file

@ -67,7 +67,7 @@
<button [cdkCopyToClipboard]="videoChannel.nameWithHostForced" (click)="activateCopiedMessage()"
class="btn btn-outline-secondary btn-sm copy-button" title="Copy channel handle" i18n-title
>
<span class="glyphicon glyphicon-duplicate"></span>
<my-global-icon iconName="copy"></my-global-icon>
</button>
</div>

6
client/src/app/+video-channels/video-channels.component.scss
View file

@ -150,7 +150,13 @@
}
.copy-button {
@include margin-left(3px);
border: 0;
my-global-icon {
width: 15px;
}
}
@media screen and (max-width: 1400px) {

2
client/src/app/shared/shared-forms/input-toggle-hidden.component.html
View file

@ -13,7 +13,7 @@
*ngIf="withCopy" [cdkCopyToClipboard]="input.value" (click)="activateCopiedMessage()" type="button"
class="btn btn-outline-secondary text-uppercase" i18n-title title="Copy"
>
<span class="glyphicon glyphicon-duplicate"></span>
<my-global-icon iconName="copy"></my-global-icon>
<span class="copy-text">Copy</span>
</button>
</div>

4
client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
View file

@ -11,6 +11,10 @@ input {
font-size: 15px;
}
my-global-icon {
width: 18px;
}
.copy-text {
font-size: 14px;
margin-left: 5px;

1
client/src/app/shared/shared-icons/global-icon.component.ts
View file

@ -21,6 +21,7 @@ const icons = {
local: require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
// feather icons
copy: require('!!raw-loader?!../../../assets/images/feather/copy.svg').default,
flag: require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
playlists: require('!!raw-loader?!../../../assets/images/feather/list.svg').default,
syndication: require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default,

1
client/src/app/shared/shared-share-modal/video-share.component.html
View file

@ -25,7 +25,6 @@
<ng-template ngbNavContent>
<div class="nav-content">
<my-input-toggle-hidden [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden>
</div>
</ng-template>

28
client/src/app/shared/shared-video-miniature/video-download.component.html
View file

@ -28,16 +28,10 @@
<ng-template ngbNavContent>
<div class="nav-content">
<div class="input-group">
<input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="getLink()" />
<button
*ngIf="!isConfidentialVideo()" type="button" class="btn btn-outline-secondary"
[cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()"
>
<span class="glyphicon glyphicon-duplicate"></span>
</button>
</div>
<my-input-toggle-hidden
*ngIf="!isConfidentialVideo()"
[show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()"
></my-input-toggle-hidden>
</div>
</ng-template>
</ng-container>
@ -54,16 +48,10 @@
<ng-template ngbNavContent>
<div class="nav-content">
<div class="input-group">
<input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="getLink()" />
<button
*ngIf="!isConfidentialVideo()" type="button" class="btn btn-outline-secondary"
[cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()"
>
<span class="glyphicon glyphicon-duplicate"></span>
</button>
</div>
<my-input-toggle-hidden
*ngIf="!isConfidentialVideo()"
[show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()"
></my-input-toggle-hidden>
</div>
</ng-template>
</ng-container>

7
client/src/app/shared/shared-video-miniature/video-download.component.scss
View file

@ -5,13 +5,6 @@
margin-top: 30px;
}
.input-group > input {
@include peertube-input-text(auto);
font-size: 14px;
padding: 0 5px;
}
.advanced-filters-button {
display: flex;
justify-content: center;

4
client/src/app/shared/shared-video-miniature/video-download.component.ts
View file

@ -193,10 +193,6 @@ export class VideoDownloadComponent {
return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL
}
activateCopiedMessage () {
this.notifier.success($localize`Copied`)
}
switchToType (type: DownloadType) {
this.type = type
}

1
client/src/assets/images/feather/copy.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-copy"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>
Side by side

After

Width:  |  Height:  |  Size: 351 B