mirror of https://github.com/Chocobozzz/PeerTube
Prefer global icon instead of glyphicon for copy
parent
073367bb65
commit
b15fcd49bf
|
@ -28,7 +28,7 @@
|
||||||
<button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()"
|
<button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()"
|
||||||
class="btn btn-outline-secondary btn-sm copy-button" title="Copy account handle" i18n-title
|
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>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,13 @@ my-user-moderation-dropdown {
|
||||||
}
|
}
|
||||||
|
|
||||||
.copy-button {
|
.copy-button {
|
||||||
|
@include margin-left(3px);
|
||||||
|
|
||||||
border: 0;
|
border: 0;
|
||||||
|
|
||||||
|
my-global-icon {
|
||||||
|
width: 15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.account-info {
|
.account-info {
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
<button [cdkCopyToClipboard]="videoChannel.nameWithHostForced" (click)="activateCopiedMessage()"
|
<button [cdkCopyToClipboard]="videoChannel.nameWithHostForced" (click)="activateCopiedMessage()"
|
||||||
class="btn btn-outline-secondary btn-sm copy-button" title="Copy channel handle" i18n-title
|
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>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -150,7 +150,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.copy-button {
|
.copy-button {
|
||||||
|
@include margin-left(3px);
|
||||||
|
|
||||||
border: 0;
|
border: 0;
|
||||||
|
|
||||||
|
my-global-icon {
|
||||||
|
width: 15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 1400px) {
|
@media screen and (max-width: 1400px) {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*ngIf="withCopy" [cdkCopyToClipboard]="input.value" (click)="activateCopiedMessage()" type="button"
|
*ngIf="withCopy" [cdkCopyToClipboard]="input.value" (click)="activateCopiedMessage()" type="button"
|
||||||
class="btn btn-outline-secondary text-uppercase" i18n-title title="Copy"
|
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>
|
<span class="copy-text">Copy</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -11,6 +11,10 @@ input {
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my-global-icon {
|
||||||
|
width: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
.copy-text {
|
.copy-text {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
|
|
|
@ -21,6 +21,7 @@ const icons = {
|
||||||
local: require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
|
local: require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
|
||||||
|
|
||||||
// feather icons
|
// feather icons
|
||||||
|
copy: require('!!raw-loader?!../../../assets/images/feather/copy.svg').default,
|
||||||
flag: require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
|
flag: require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
|
||||||
playlists: require('!!raw-loader?!../../../assets/images/feather/list.svg').default,
|
playlists: require('!!raw-loader?!../../../assets/images/feather/list.svg').default,
|
||||||
syndication: require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default,
|
syndication: require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default,
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
|
|
||||||
<ng-template ngbNavContent>
|
<ng-template ngbNavContent>
|
||||||
<div class="nav-content">
|
<div class="nav-content">
|
||||||
|
|
||||||
<my-input-toggle-hidden [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden>
|
<my-input-toggle-hidden [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
|
@ -28,16 +28,10 @@
|
||||||
|
|
||||||
<ng-template ngbNavContent>
|
<ng-template ngbNavContent>
|
||||||
<div class="nav-content">
|
<div class="nav-content">
|
||||||
<div class="input-group">
|
<my-input-toggle-hidden
|
||||||
<input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="getLink()" />
|
*ngIf="!isConfidentialVideo()"
|
||||||
|
[show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()"
|
||||||
<button
|
></my-input-toggle-hidden>
|
||||||
*ngIf="!isConfidentialVideo()" type="button" class="btn btn-outline-secondary"
|
|
||||||
[cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()"
|
|
||||||
>
|
|
||||||
<span class="glyphicon glyphicon-duplicate"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
@ -54,16 +48,10 @@
|
||||||
|
|
||||||
<ng-template ngbNavContent>
|
<ng-template ngbNavContent>
|
||||||
<div class="nav-content">
|
<div class="nav-content">
|
||||||
<div class="input-group">
|
<my-input-toggle-hidden
|
||||||
<input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="getLink()" />
|
*ngIf="!isConfidentialVideo()"
|
||||||
|
[show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()"
|
||||||
<button
|
></my-input-toggle-hidden>
|
||||||
*ngIf="!isConfidentialVideo()" type="button" class="btn btn-outline-secondary"
|
|
||||||
[cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()"
|
|
||||||
>
|
|
||||||
<span class="glyphicon glyphicon-duplicate"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
|
@ -5,13 +5,6 @@
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-group > input {
|
|
||||||
@include peertube-input-text(auto);
|
|
||||||
|
|
||||||
font-size: 14px;
|
|
||||||
padding: 0 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.advanced-filters-button {
|
.advanced-filters-button {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
|
@ -193,10 +193,6 @@ export class VideoDownloadComponent {
|
||||||
return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL
|
return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL
|
||||||
}
|
}
|
||||||
|
|
||||||
activateCopiedMessage () {
|
|
||||||
this.notifier.success($localize`Copied`)
|
|
||||||
}
|
|
||||||
|
|
||||||
switchToType (type: DownloadType) {
|
switchToType (type: DownloadType) {
|
||||||
this.type = type
|
this.type = type
|
||||||
}
|
}
|
||||||
|
|
|
@ -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>
|
After Width: | Height: | Size: 351 B |
Loading…
Reference in New Issue