aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-06-04 20:55:25 +0200
committerRigel Kent <sendmemail@rigelk.eu>2020-06-04 20:57:10 +0200
commit80c7779efeab644410dee2f21428322b1f0e3500 (patch)
tree7b7d84e6f3a5f30189f98d36eaa97eaa9b7ae557 /client/src
parent4282dafc826f5ca72598aa5446122eb6da3aed27 (diff)
downloadPeerTube-80c7779efeab644410dee2f21428322b1f0e3500.tar.gz
PeerTube-80c7779efeab644410dee2f21428322b1f0e3500.tar.zst
PeerTube-80c7779efeab644410dee2f21428322b1f0e3500.zip
fix mascot sizes, fix tick, delete extraneous .png icons
follows PR #2822
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html8
-rw-r--r--client/src/app/modal/instance-config-warning-modal.component.html12
-rw-r--r--client/src/app/modal/instance-config-warning-modal.component.scss10
-rw-r--r--client/src/app/modal/welcome-modal.component.html8
-rw-r--r--client/src/app/modal/welcome-modal.component.scss6
-rw-r--r--client/src/app/shared/video/abstract-video-list.scss1
-rw-r--r--client/src/assets/images/global/tick.svg4
-rw-r--r--client/src/assets/images/mascot/arguing.pngbin11783 -> 0 bytes
-rw-r--r--client/src/assets/images/mascot/default.pngbin10134 -> 0 bytes
-rw-r--r--client/src/assets/images/mascot/defeated.pngbin8891 -> 0 bytes
-rw-r--r--client/src/assets/images/mascot/happy.pngbin11242 -> 0 bytes
-rw-r--r--client/src/assets/images/mascot/happy.svg2
-rw-r--r--client/src/assets/images/mascot/oh.pngbin10806 -> 0 bytes
-rw-r--r--client/src/assets/images/mascot/pointing.pngbin10518 -> 0 bytes
14 files changed, 23 insertions, 28 deletions
diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html
index 05335dc1a..ff9cd37ea 100644
--- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html
+++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html
@@ -32,7 +32,7 @@
32 <div class="form-group"> 32 <div class="form-group">
33 <label i18n for="displayName">Display name</label> 33 <label i18n for="displayName">Display name</label>
34 <input 34 <input
35 type="text" id="displayName" 35 type="text" id="displayName" class="form-control"
36 formControlName="displayName" [ngClass]="{ 'input-error': formErrors['displayName'] }" 36 formControlName="displayName" [ngClass]="{ 'input-error': formErrors['displayName'] }"
37 > 37 >
38 <div *ngIf="formErrors['displayName']" class="form-error"> 38 <div *ngIf="formErrors['displayName']" class="form-error">
@@ -44,7 +44,7 @@
44 <label i18n for="description">Description</label> 44 <label i18n for="description">Description</label>
45 <textarea 45 <textarea
46 id="description" formControlName="description" 46 id="description" formControlName="description"
47 [ngClass]="{ 'input-error': formErrors['description'] }" 47 class="form-control" [ngClass]="{ 'input-error': formErrors['description'] }"
48 ></textarea> 48 ></textarea>
49 <div *ngIf="formErrors.description" class="form-error"> 49 <div *ngIf="formErrors.description" class="form-error">
50 {{ formErrors.description }} 50 {{ formErrors.description }}
@@ -56,7 +56,7 @@
56 <div class="form-group"> 56 <div class="form-group">
57 <label i18n for="privacy">Privacy</label> 57 <label i18n for="privacy">Privacy</label>
58 <div class="peertube-select-container"> 58 <div class="peertube-select-container">
59 <select id="privacy" formControlName="privacy"> 59 <select id="privacy" formControlName="privacy" class="form-control">
60 <option *ngFor="let privacy of videoPlaylistPrivacies" [value]="privacy.id">{{ privacy.label }}</option> 60 <option *ngFor="let privacy of videoPlaylistPrivacies" [value]="privacy.id">{{ privacy.label }}</option>
61 </select> 61 </select>
62 </div> 62 </div>
@@ -69,7 +69,7 @@
69 <div class="form-group"> 69 <div class="form-group">
70 <label i18n>Channel</label> 70 <label i18n>Channel</label>
71 <div class="peertube-select-container"> 71 <div class="peertube-select-container">
72 <select formControlName="videoChannelId"> 72 <select formControlName="videoChannelId" class="form-control">
73 <option></option> 73 <option></option>
74 <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option> 74 <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option>
75 </select> 75 </select>
diff --git a/client/src/app/modal/instance-config-warning-modal.component.html b/client/src/app/modal/instance-config-warning-modal.component.html
index 5a8290cda..5a8adf726 100644
--- a/client/src/app/modal/instance-config-warning-modal.component.html
+++ b/client/src/app/modal/instance-config-warning-modal.component.html
@@ -7,7 +7,7 @@
7 <div class="modal-body"> 7 <div class="modal-body">
8 <img class="mascot" src="/client/assets/images/mascot/oh.svg" alt="mascot" /> 8 <img class="mascot" src="/client/assets/images/mascot/oh.svg" alt="mascot" />
9 9
10 <p i18n>Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:</p> 10 <p i18n>You enabled user registration on your instance but did not configure the following fields:</p>
11 11
12 <ul> 12 <ul>
13 <li i18n *ngIf="about.instance.name.toLowerCase() === 'peertube'">Instance name</li> 13 <li i18n *ngIf="about.instance.name.toLowerCase() === 'peertube'">Instance name</li>
@@ -25,11 +25,6 @@
25 Please consider configuring these fields to help people to choose <strong>the appropriate instance</strong>. 25 Please consider configuring these fields to help people to choose <strong>the appropriate instance</strong>.
26 Without them, your instance may not be referenced on the <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">JoinPeerTube website</a>. 26 Without them, your instance may not be referenced on the <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">JoinPeerTube website</a>.
27 </p> 27 </p>
28
29 <div class="configure-instance">
30 <a i18n class="action-button action-button-configure" href="/admin/config/edit-custom" target="_blank" rel="noopener noreferrer">Configure these fields</a>
31 </div>
32
33 </div> 28 </div>
34 29
35 <div class="modal-footer inputs"> 30 <div class="modal-footer inputs">
@@ -37,13 +32,16 @@
37 inputName="stopDisplayModal" [(ngModel)]="stopDisplayModal" 32 inputName="stopDisplayModal" [(ngModel)]="stopDisplayModal"
38 i18n-labelText labelText="Don't show me this warning anymore" 33 i18n-labelText labelText="Don't show me this warning anymore"
39 > 34 >
40
41 </my-peertube-checkbox> 35 </my-peertube-checkbox>
42 36
43 <input 37 <input
44 type="button" role="button" i18n-value value="Close" class="action-button action-button-cancel" 38 type="button" role="button" i18n-value value="Close" class="action-button action-button-cancel"
45 (click)="hide()" (key.enter)="hide()" 39 (click)="hide()" (key.enter)="hide()"
46 > 40 >
41 <a i18n class="action-button action-button-configure" ngbAutofocus
42 href="/admin/config/edit-custom" target="_blank" rel="noopener noreferrer">
43 Configure
44 </a>
47 </div> 45 </div>
48 46
49</ng-template> 47</ng-template>
diff --git a/client/src/app/modal/instance-config-warning-modal.component.scss b/client/src/app/modal/instance-config-warning-modal.component.scss
index 4a76a1319..cc97d64e4 100644
--- a/client/src/app/modal/instance-config-warning-modal.component.scss
+++ b/client/src/app/modal/instance-config-warning-modal.component.scss
@@ -13,17 +13,10 @@ li {
13 margin-bottom: 10px; 13 margin-bottom: 10px;
14} 14}
15 15
16.configure-instance {
17 text-align: center;
18 font-weight: 600;
19 font-size: 18px;
20 margin-top: 40px;
21 margin-bottom: 10px;
22}
23
24.mascot { 16.mascot {
25 display: block; 17 display: block;
26 margin: 0 auto 50px; 18 margin: 0 auto 50px;
19 width: 25%;
27} 20}
28 21
29.action-button-configure { 22.action-button-configure {
@@ -31,4 +24,5 @@ li {
31 24
32 @include peertube-button; 25 @include peertube-button;
33 @include orange-button; 26 @include orange-button;
27 @include disable-default-a-behaviour;
34} 28}
diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html
index 8bfcc4bf6..81c12d4c0 100644
--- a/client/src/app/modal/welcome-modal.component.html
+++ b/client/src/app/modal/welcome-modal.component.html
@@ -33,9 +33,7 @@
33 33
34 <div class="two-columns"> 34 <div class="two-columns">
35 35
36 <div class="mascot"> 36 <img class="mascot mascot-fw" src="/client/assets/images/mascot/pointing.svg" alt="mascot">
37 <img src="/client/assets/images/mascot/pointing.png" alt="mascot">
38 </div>
39 37
40 <div class="block-links"> 38 <div class="block-links">
41 <div i18n class="subtitle">Useful links</div> 39 <div i18n class="subtitle">Useful links</div>
@@ -51,9 +49,7 @@
51 </div> 49 </div>
52 50
53 <div class="two-columns"> 51 <div class="two-columns">
54 <div class="mascot"> 52 <img class="mascot" src="/client/assets/images/mascot/happy.svg" alt="mascot">
55 <img src="/client/assets/images/mascot/happy.png" alt="mascot">
56 </div>
57 53
58 <div class="block-configuration"> 54 <div class="block-configuration">
59 <div i18n class="subtitle">It's time to configure your instance!</div> 55 <div i18n class="subtitle">It's time to configure your instance!</div>
diff --git a/client/src/app/modal/welcome-modal.component.scss b/client/src/app/modal/welcome-modal.component.scss
index 6214f3b9d..c04772546 100644
--- a/client/src/app/modal/welcome-modal.component.scss
+++ b/client/src/app/modal/welcome-modal.component.scss
@@ -12,9 +12,14 @@
12 margin-top: 50px; 12 margin-top: 50px;
13} 13}
14 14
15.mascot-fw {
16 width: 170px;
17}
18
15.mascot { 19.mascot {
16 display: block; 20 display: block;
17 min-width: 170px; 21 min-width: 170px;
22 margin-right: 2rem;
18} 23}
19 24
20.subtitle { 25.subtitle {
@@ -73,6 +78,7 @@ li {
73.configure-instance-button { 78.configure-instance-button {
74 @include peertube-button; 79 @include peertube-button;
75 @include orange-button; 80 @include orange-button;
81 @include disable-default-a-behaviour;
76 82
77 display: inline-block; 83 display: inline-block;
78} 84}
diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss
index 44b629542..4149c9109 100644
--- a/client/src/app/shared/video/abstract-video-list.scss
+++ b/client/src/app/shared/video/abstract-video-list.scss
@@ -4,7 +4,6 @@
4.videos-header { 4.videos-header {
5 display: flex; 5 display: flex;
6 justify-content: space-between; 6 justify-content: space-between;
7 height: 80px;
8 align-items: baseline; 7 align-items: baseline;
9 8
10 .title-page.title-page-single { 9 .title-page.title-page-single {
diff --git a/client/src/assets/images/global/tick.svg b/client/src/assets/images/global/tick.svg
index dd7e8face..f34040bab 100644
--- a/client/src/assets/images/global/tick.svg
+++ b/client/src/assets/images/global/tick.svg
@@ -1,4 +1,6 @@
1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> 1<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
2 <defs/> 2 <defs/>
3 <path fill="#000" fill-rule="evenodd" d="M13 19a1 1 0 100 2 9 9 0 10-9-9h2a7 7 0 117 7zm-4-7H1l4 4 4-4z"/> 3 <g fill="none" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="2">
4 <path d="M21 6L9 18M4 13l5 5"/>
5 </g>
4</svg> 6</svg>
diff --git a/client/src/assets/images/mascot/arguing.png b/client/src/assets/images/mascot/arguing.png
deleted file mode 100644
index 154c45c2c..000000000
--- a/client/src/assets/images/mascot/arguing.png
+++ /dev/null
Binary files differ
diff --git a/client/src/assets/images/mascot/default.png b/client/src/assets/images/mascot/default.png
deleted file mode 100644
index e0a1410b7..000000000
--- a/client/src/assets/images/mascot/default.png
+++ /dev/null
Binary files differ
diff --git a/client/src/assets/images/mascot/defeated.png b/client/src/assets/images/mascot/defeated.png
deleted file mode 100644
index 58e1ce10a..000000000
--- a/client/src/assets/images/mascot/defeated.png
+++ /dev/null
Binary files differ
diff --git a/client/src/assets/images/mascot/happy.png b/client/src/assets/images/mascot/happy.png
deleted file mode 100644
index a51f9df14..000000000
--- a/client/src/assets/images/mascot/happy.png
+++ /dev/null
Binary files differ
diff --git a/client/src/assets/images/mascot/happy.svg b/client/src/assets/images/mascot/happy.svg
index 82661083e..9db9105a4 100644
--- a/client/src/assets/images/mascot/happy.svg
+++ b/client/src/assets/images/mascot/happy.svg
@@ -1,4 +1,4 @@
1<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55.71 62.61"> 1<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="206.3" height="224.6" viewBox="0 0 55.71 62.61">
2 <defs/> 2 <defs/>
3 <defs> 3 <defs>
4 <radialGradient id="b" cx="56.46" cy="167.69" r="20.58" fx="56.46" fy="167.69" gradientTransform="matrix(1.20299 0 0 .16716 30.28 144.89)" gradientUnits="userSpaceOnUse" xlink:href="#a"/> 4 <radialGradient id="b" cx="56.46" cy="167.69" r="20.58" fx="56.46" fy="167.69" gradientTransform="matrix(1.20299 0 0 .16716 30.28 144.89)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
diff --git a/client/src/assets/images/mascot/oh.png b/client/src/assets/images/mascot/oh.png
deleted file mode 100644
index 168b11b65..000000000
--- a/client/src/assets/images/mascot/oh.png
+++ /dev/null
Binary files differ
diff --git a/client/src/assets/images/mascot/pointing.png b/client/src/assets/images/mascot/pointing.png
deleted file mode 100644
index 670702f53..000000000
--- a/client/src/assets/images/mascot/pointing.png
+++ /dev/null
Binary files differ