aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/modal/quick-settings-modal.component.html1
-rw-r--r--client/src/app/shared/confirm/confirm.component.ts2
-rw-r--r--client/src/app/shared/forms/input-readonly-copy.component.html2
-rw-r--r--client/src/app/shared/video-playlist/video-add-to-playlist.component.scss5
-rw-r--r--client/src/app/shared/video/modals/video-blacklist.component.html8
-rw-r--r--client/src/app/shared/video/video-actions-dropdown.component.ts7
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment-add.component.html13
-rw-r--r--client/src/app/videos/+video-watch/modal/video-share.component.scss4
-rw-r--r--client/src/sass/bootstrap.scss8
-rw-r--r--client/src/sass/include/_mixins.scss13
10 files changed, 38 insertions, 25 deletions
diff --git a/client/src/app/modal/quick-settings-modal.component.html b/client/src/app/modal/quick-settings-modal.component.html
index 8ee83e7dc..e2ea51b92 100644
--- a/client/src/app/modal/quick-settings-modal.component.html
+++ b/client/src/app/modal/quick-settings-modal.component.html
@@ -1,6 +1,7 @@
1<ng-template #modal let-hide="close"> 1<ng-template #modal let-hide="close">
2 <div class="modal-header"> 2 <div class="modal-header">
3 <h4 i18n class="modal-title">Settings</h4> 3 <h4 i18n class="modal-title">Settings</h4>
4 <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon>
4 </div> 5 </div>
5 6
6 <div class="modal-body"> 7 <div class="modal-body">
diff --git a/client/src/app/shared/confirm/confirm.component.ts b/client/src/app/shared/confirm/confirm.component.ts
index 763454c4f..d67d4f3c8 100644
--- a/client/src/app/shared/confirm/confirm.component.ts
+++ b/client/src/app/shared/confirm/confirm.component.ts
@@ -60,7 +60,7 @@ export class ConfirmComponent implements OnInit {
60 showModal () { 60 showModal () {
61 this.inputValue = '' 61 this.inputValue = ''
62 62
63 this.openedModal = this.modalService.open(this.confirmModal) 63 this.openedModal = this.modalService.open(this.confirmModal, { centered: true })
64 64
65 this.openedModal.result 65 this.openedModal.result
66 .then(() => this.confirmService.confirmResponse.next(true)) 66 .then(() => this.confirmService.confirmResponse.next(true))
diff --git a/client/src/app/shared/forms/input-readonly-copy.component.html b/client/src/app/shared/forms/input-readonly-copy.component.html
index b6a56ec44..9566e9741 100644
--- a/client/src/app/shared/forms/input-readonly-copy.component.html
+++ b/client/src/app/shared/forms/input-readonly-copy.component.html
@@ -1,4 +1,4 @@
1<div class="input-group"> 1<div class="input-group input-group-sm">
2 <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="value" /> 2 <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="value" />
3 3
4 <div class="input-group-append"> 4 <div class="input-group-append">
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss
index f1b6cd601..1724449e8 100644
--- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss
+++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss
@@ -4,7 +4,7 @@
4.header, 4.header,
5.dropdown-item, 5.dropdown-item,
6.input-container { 6.input-container {
7 padding: 6px 24px 10px 24px; 7 padding: 8px 24px;
8} 8}
9 9
10.header { 10.header {
@@ -54,11 +54,12 @@
54} 54}
55 55
56.playlist { 56.playlist {
57 display: flex; 57 display: inline-flex;
58 cursor: pointer; 58 cursor: pointer;
59 59
60 my-peertube-checkbox { 60 my-peertube-checkbox {
61 margin-right: 10px; 61 margin-right: 10px;
62 align-self: center;
62 } 63 }
63 64
64 .display-name { 65 .display-name {
diff --git a/client/src/app/shared/video/modals/video-blacklist.component.html b/client/src/app/shared/video/modals/video-blacklist.component.html
index 1a87bdcd4..857a4dcec 100644
--- a/client/src/app/shared/video/modals/video-blacklist.component.html
+++ b/client/src/app/shared/video/modals/video-blacklist.component.html
@@ -18,8 +18,12 @@
18 <div class="form-group" *ngIf="video.isLocal"> 18 <div class="form-group" *ngIf="video.isLocal">
19 <my-peertube-checkbox 19 <my-peertube-checkbox
20 inputName="unfederate" formControlName="unfederate" 20 inputName="unfederate" formControlName="unfederate"
21 i18n-labelText labelText="Unfederate the video (ask for its deletion from the remote instances)" 21 i18n-labelText labelText="Unfederate the video"
22 ></my-peertube-checkbox> 22 >
23 <ng-container ngProjectAs="description">
24 <span i18n>This will ask remote instances to delete it</span>
25 </ng-container>
26 </my-peertube-checkbox>
23 </div> 27 </div>
24 28
25 <div class="form-group inputs"> 29 <div class="form-group inputs">
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts
index 69f45346e..67c4d6fbc 100644
--- a/client/src/app/shared/video/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/video/video-actions-dropdown.component.ts
@@ -1,8 +1,7 @@
1import { AfterViewInit, Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core' 1import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core'
2import { I18n } from '@ngx-translate/i18n-polyfill' 2import { I18n } from '@ngx-translate/i18n-polyfill'
3import { DropdownAction, DropdownButtonSize, DropdownDirection } from '@app/shared/buttons/action-dropdown.component' 3import { DropdownAction, DropdownButtonSize, DropdownDirection } from '@app/shared/buttons/action-dropdown.component'
4import { AuthService, ConfirmService, Notifier, ServerService } from '@app/core' 4import { AuthService, ConfirmService, Notifier } from '@app/core'
5import { BlocklistService } from '@app/shared/blocklist'
6import { Video } from '@app/shared/video/video.model' 5import { Video } from '@app/shared/video/video.model'
7import { VideoService } from '@app/shared/video/video.service' 6import { VideoService } from '@app/shared/video/video.service'
8import { VideoDetails } from '@app/shared/video/video-details.model' 7import { VideoDetails } from '@app/shared/video/video-details.model'
@@ -73,10 +72,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
73 private notifier: Notifier, 72 private notifier: Notifier,
74 private confirmService: ConfirmService, 73 private confirmService: ConfirmService,
75 private videoBlacklistService: VideoBlacklistService, 74 private videoBlacklistService: VideoBlacklistService,
76 private serverService: ServerService,
77 private screenService: ScreenService, 75 private screenService: ScreenService,
78 private videoService: VideoService, 76 private videoService: VideoService,
79 private blocklistService: BlocklistService,
80 private redundancyService: RedundancyService, 77 private redundancyService: RedundancyService,
81 private i18n: I18n 78 private i18n: I18n
82 ) { } 79 ) { }
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 3a9977df6..29c7a8bfa 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -29,15 +29,11 @@
29<ng-template #visitorModal let-modal> 29<ng-template #visitorModal let-modal>
30 <div class="modal-header"> 30 <div class="modal-header">
31 <h4 class="modal-title" id="modal-basic-title" i18n>You are one step away from commenting</h4> 31 <h4 class="modal-title" id="modal-basic-title" i18n>You are one step away from commenting</h4>
32 <button type="button" class="close" aria-label="Close" (click)="hideVisitorModal()"></button> 32 <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hideVisitorModal()"></my-global-icon>
33 </div> 33 </div>
34 <div class="modal-body"> 34 <div class="modal-body">
35 <span i18n> 35 <span i18n>
36 If you have an account on this instance, you can login: 36 You can comment using an account on any ActivityPub-compatible instance.
37 </span>
38 <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span>
39 <span i18n>
40 Otherwise, you can comment using an account on any ActivityPub-compatible instance.
41 On most platforms, you can find the video by typing its URL in the search bar and then comment it 37 On most platforms, you can find the video by typing its URL in the search bar and then comment it
42 from within the software's interface. 38 from within the software's interface.
43 </span> 39 </span>
@@ -50,5 +46,10 @@
50 <span i18n class="action-button action-button-cancel" role="button" (click)="hideVisitorModal()"> 46 <span i18n class="action-button action-button-cancel" role="button" (click)="hideVisitorModal()">
51 Cancel 47 Cancel
52 </span> 48 </span>
49
50 <input
51 type="submit" i18n-value value="Login to comment" class="action-button-submit"
52 (click)="gotoLogin()"
53 >
53 </div> 54 </div>
54</ng-template> 55</ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/videos/+video-watch/modal/video-share.component.scss
index a5766d983..11cbb8c0b 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.scss
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.scss
@@ -17,10 +17,6 @@ my-input-readonly-copy {
17 @include peertube-select-container(200px); 17 @include peertube-select-container(200px);
18} 18}
19 19
20.action-button-cancel {
21 margin-right: 0 !important;
22}
23
24.qr-code-group { 20.qr-code-group {
25 text-align: center; 21 text-align: center;
26} 22}
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index bb7b21274..61f9d016b 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -95,15 +95,15 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
95 } 95 }
96 96
97 my-global-icon { 97 my-global-icon {
98 @include icon(24px); 98 @include icon(22px);
99 99
100 position: relative; 100 position: relative;
101 top: 3px; 101 top: 5px;
102 float: right; 102 float: right;
103 103
104 margin: 0; 104 margin: 0;
105 padding: 0; 105 padding: 0;
106 opacity: 1; 106 opacity: .5;
107 } 107 }
108 } 108 }
109 109
@@ -113,7 +113,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
113 113
114 .action-button-cancel { 114 .action-button-cancel {
115 @include peertube-button; 115 @include peertube-button;
116 @include grey-button; 116 @include tertiary-button;
117 117
118 display: inline-block; 118 display: inline-block;
119 margin-right: 10px; 119 margin-right: 10px;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index de9c9d6d6..9a8d0073a 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -150,6 +150,19 @@
150 } 150 }
151} 151}
152 152
153@mixin tertiary-button {
154 color: $grey-foreground-color;
155 background-color: transparent;
156
157 &[disabled], &.disabled {
158 cursor: default;
159 }
160
161 my-global-icon {
162 @include apply-svg-color(transparent)
163 }
164}
165
153@mixin grey-button { 166@mixin grey-button {
154 &, &:active, &:focus { 167 &, &:active, &:focus {
155 background-color: $grey-background-color; 168 background-color: $grey-background-color;