aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/e2e/src/po/video-upload.po.ts2
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-edit.component.scss18
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html11
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html11
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html11
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html2
6 files changed, 14 insertions, 41 deletions
diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts
index 7de715a95..942025b6b 100644
--- a/client/e2e/src/po/video-upload.po.ts
+++ b/client/e2e/src/po/video-upload.po.ts
@@ -40,6 +40,6 @@ export class VideoUploadPage {
40 } 40 }
41 41
42 private getSecondStepSubmitButton () { 42 private getSecondStepSubmitButton () {
43 return element(by.css('.submit-button:not(.disabled)')) 43 return element(by.css('.submit-container my-button'))
44 } 44 }
45} 45}
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
index c2fbb46f9..0b70b0270 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
@@ -126,24 +126,6 @@ my-peertube-checkbox {
126 color: pvar(--greyForegroundColor); 126 color: pvar(--greyForegroundColor);
127 font-size: 15px; 127 font-size: 15px;
128 } 128 }
129
130 .submit-button {
131 @include peertube-button;
132 @include orange-button;
133 @include button-with-icon(20px, 1px);
134
135 display: inline-block;
136
137 input {
138 cursor: inherit;
139 background-color: inherit;
140 border: none;
141 padding: 0;
142 outline: 0;
143 color: inherit;
144 font-weight: $font-semibold;
145 }
146 }
147} 129}
148 130
149p-calendar { 131p-calendar {
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html
index 136048455..17c37d42b 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html
@@ -42,12 +42,9 @@
42 ></my-video-edit> 42 ></my-video-edit>
43 43
44 <div class="submit-container"> 44 <div class="submit-container">
45 <div class="submit-button" 45 <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
46 (click)="updateSecondStep()" 46 (click)="updateSecondStep()"
47 [ngClass]="{ disabled: !form.valid }" 47 [disabled]="!form.valid"
48 > 48 ></my-button>
49 <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
50 <input type="button" i18n-value value="Update" />
51 </div>
52 </div> 49 </div>
53</form> 50</form>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
index 211acc6f6..20a7538db 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
@@ -65,12 +65,9 @@
65 ></my-video-edit> 65 ></my-video-edit>
66 66
67 <div class="submit-container"> 67 <div class="submit-container">
68 <div class="submit-button" 68 <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
69 (click)="updateSecondStep()" 69 (click)="updateSecondStep()"
70 [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" 70 [disabled]="!form.valid || isUpdatingVideo === true"
71 > 71 ></my-button>
72 <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
73 <input type="button" i18n-value value="Update" />
74 </div>
75 </div> 72 </div>
76</form> 73</form>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
index 3e4eb5fbc..93d3c6b5f 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
@@ -58,12 +58,9 @@
58 ></my-video-edit> 58 ></my-video-edit>
59 59
60 <div class="submit-container"> 60 <div class="submit-container">
61 <div class="submit-button" 61 <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
62 (click)="updateSecondStep()" 62 (click)="updateSecondStep()"
63 [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" 63 [disabled]="!form.valid || isUpdatingVideo === true"
64 > 64 ></my-button>
65 <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
66 <input type="button" i18n-value value="Update" />
67 </div>
68 </div> 65 </div>
69</form> 66</form>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index 51e16150e..deea3daf9 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
@@ -91,7 +91,7 @@
91 <div class="submit-container"> 91 <div class="submit-container">
92 <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div> 92 <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
93 93
94 <my-button className="submit-button orange-button" i18n-label label="Publish" icon="circle-tick" 94 <my-button className="orange-button" i18n-label label="Publish" icon="circle-tick"
95 (click)="updateSecondStep()" (keydown.enter)="updateSecondStep()" 95 (click)="updateSecondStep()" (keydown.enter)="updateSecondStep()"
96 [disabled]="isPublishingButtonDisabled()" 96 [disabled]="isPublishingButtonDisabled()"
97 ></my-button> 97 ></my-button>