fix mascot sizes, fix tick, delete extraneous .png icons

follows PR #2822

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 05335dc1ab6628cedbe711d8c538072fd6ba9337..ff9cd37eacaa3fbceba03873b2361db4c5949576 100644 (file)
--- 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 @@
         <div class="form-group">
           <label i18n for="displayName">Display name</label>
           <input
-            type="text" id="displayName"
+            type="text" id="displayName" class="form-control"
             formControlName="displayName" [ngClass]="{ 'input-error': formErrors['displayName'] }"
           >
           <div *ngIf="formErrors['displayName']" class="form-error">
@@ -44,7 +44,7 @@
           <label i18n for="description">Description</label>
           <textarea
             id="description" formControlName="description"
-            [ngClass]="{ 'input-error': formErrors['description'] }"
+            class="form-control" [ngClass]="{ 'input-error': formErrors['description'] }"
           ></textarea>
           <div *ngIf="formErrors.description" class="form-error">
             {{ formErrors.description }}
@@ -56,7 +56,7 @@
         <div class="form-group">
           <label i18n for="privacy">Privacy</label>
           <div class="peertube-select-container">
-            <select id="privacy" formControlName="privacy">
+            <select id="privacy" formControlName="privacy" class="form-control">
               <option *ngFor="let privacy of videoPlaylistPrivacies" [value]="privacy.id">{{ privacy.label }}</option>
             </select>
           </div>
@@ -69,7 +69,7 @@
         <div class="form-group">
           <label i18n>Channel</label>
           <div class="peertube-select-container">
-            <select formControlName="videoChannelId">
+            <select formControlName="videoChannelId" class="form-control">
               <option></option>
               <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option>
             </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 5a8290cda57d19ffa5eca532de33375abbcbc2ca..5a8adf7264f53132908fff1fa4034610f5f69c09 100644 (file)
--- 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 @@
   <div class="modal-body">
     <img class="mascot" src="/client/assets/images/mascot/oh.svg" alt="mascot" />
 
-    <p i18n>Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:</p>
+    <p i18n>You enabled user registration on your instance but did not configure the following fields:</p>
 
     <ul>
       <li i18n *ngIf="about.instance.name.toLowerCase() === 'peertube'">Instance name</li>
@@ -25,11 +25,6 @@
       Please consider configuring these fields to help people to choose <strong>the appropriate instance</strong>.
       Without them, your instance may not be referenced on the <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">JoinPeerTube website</a>.
     </p>
-
-    <div class="configure-instance">
-      <a i18n class="action-button action-button-configure" href="/admin/config/edit-custom" target="_blank" rel="noopener noreferrer">Configure these fields</a>
-    </div>
-
   </div>
 
   <div class="modal-footer inputs">
@@ -37,13 +32,16 @@
       inputName="stopDisplayModal" [(ngModel)]="stopDisplayModal"
       i18n-labelText labelText="Don't show me this warning anymore"
     >
-
     </my-peertube-checkbox>
 
     <input
       type="button" role="button" i18n-value value="Close" class="action-button action-button-cancel"
       (click)="hide()" (key.enter)="hide()"
     >
+    <a i18n class="action-button action-button-configure" ngbAutofocus
+       href="/admin/config/edit-custom" target="_blank" rel="noopener noreferrer">
+       Configure
+    </a>
   </div>
 
 </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 4a76a13190d0de702bbbf64d7d8eef8f9b72ee33..cc97d64e404b2b0d1c8d422f657c7600c10c7c39 100644 (file)
--- 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 {
   margin-bottom: 10px;
 }
 
-.configure-instance {
-  text-align: center;
-  font-weight: 600;
-  font-size: 18px;
-  margin-top: 40px;
-  margin-bottom: 10px;
-}
-
 .mascot {
   display: block;
   margin: 0 auto 50px;
+  width: 25%;
 }
 
 .action-button-configure {
@@ -31,4 +24,5 @@ li {
 
   @include peertube-button;
   @include orange-button;
+  @include disable-default-a-behaviour;
 }

diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html
index 8bfcc4bf69fd495b803288a744a894c833725fc1..81c12d4c0f6bfa012fd98c1379412193af7cd9ec 100644 (file)
--- a/client/src/app/modal/welcome-modal.component.html
+++ b/client/src/app/modal/welcome-modal.component.html
@@ -33,9 +33,7 @@
 
     <div class="two-columns">
 
-      <div class="mascot">
-        <img src="/client/assets/images/mascot/pointing.png" alt="mascot">
-      </div>
+      <img class="mascot mascot-fw" src="/client/assets/images/mascot/pointing.svg" alt="mascot">
 
       <div class="block-links">
         <div i18n class="subtitle">Useful links</div>
@@ -51,9 +49,7 @@
     </div>
 
     <div class="two-columns">
-      <div class="mascot">
-        <img src="/client/assets/images/mascot/happy.png" alt="mascot">
-      </div>
+      <img class="mascot" src="/client/assets/images/mascot/happy.svg" alt="mascot">
 
       <div class="block-configuration">
         <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 6214f3b9d047a35e2f7daaa08d048410bc357c18..c04772546102ffd7addbafa340242bdde8e9c0bb 100644 (file)
--- a/client/src/app/modal/welcome-modal.component.scss
+++ b/client/src/app/modal/welcome-modal.component.scss
@@ -12,9 +12,14 @@
   margin-top: 50px;
 }
 
+.mascot-fw {
+  width: 170px;
+}
+
 .mascot {
   display: block;
   min-width: 170px;
+  margin-right: 2rem;
 }
 
 .subtitle {
@@ -73,6 +78,7 @@ li {
 .configure-instance-button {
   @include peertube-button;
   @include orange-button;
+  @include disable-default-a-behaviour;
 
   display: inline-block;
 }

diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss
index 44b629542f7e998a4108af87deff79d25853ee56..4149c910905b6205c36cde60f83bd5725597895a 100644 (file)
--- a/client/src/app/shared/video/abstract-video-list.scss
+++ b/client/src/app/shared/video/abstract-video-list.scss
@@ -4,7 +4,6 @@
 .videos-header {
   display: flex;
   justify-content: space-between;
-  height: 80px;
   align-items: baseline;
 
   .title-page.title-page-single {

diff --git a/client/src/assets/images/global/tick.svg b/client/src/assets/images/global/tick.svg
index dd7e8face1cd9488657ea4f1e25c5af22dffd48a..f34040babf9b7fe46c98e168fc73c64d097dee3d 100644 (file)
--- a/client/src/assets/images/global/tick.svg
+++ b/client/src/assets/images/global/tick.svg
@@ -1,4 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <defs/>
-  <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"/>
+  <g fill="none" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="2">
+    <path d="M21 6L9 18M4 13l5 5"/>
+  </g>
 </svg>

diff --git a/client/src/assets/images/mascot/arguing.png b/client/src/assets/images/mascot/arguing.png
deleted file mode 100644 (file)
index 154c45c..0000000
Binary files a/client/src/assets/images/mascot/arguing.png and /dev/null differ

diff --git a/client/src/assets/images/mascot/default.png b/client/src/assets/images/mascot/default.png
deleted file mode 100644 (file)
index e0a1410..0000000
Binary files a/client/src/assets/images/mascot/default.png and /dev/null differ

diff --git a/client/src/assets/images/mascot/defeated.png b/client/src/assets/images/mascot/defeated.png
deleted file mode 100644 (file)
index 58e1ce1..0000000
Binary files a/client/src/assets/images/mascot/defeated.png and /dev/null differ

diff --git a/client/src/assets/images/mascot/happy.png b/client/src/assets/images/mascot/happy.png
deleted file mode 100644 (file)
index a51f9df..0000000
Binary files a/client/src/assets/images/mascot/happy.png and /dev/null differ

diff --git a/client/src/assets/images/mascot/happy.svg b/client/src/assets/images/mascot/happy.svg
index 82661083e95d8cce6858b95f169502fc75cabc5d..9db9105a4dd7af36d5742d036cd38905f5a25565 100644 (file)
--- a/client/src/assets/images/mascot/happy.svg
+++ b/client/src/assets/images/mascot/happy.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 55.71 62.61">
+<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">
   <defs/>
   <defs>
     <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 (file)
index 168b11b..0000000
Binary files a/client/src/assets/images/mascot/oh.png and /dev/null differ

diff --git a/client/src/assets/images/mascot/pointing.png b/client/src/assets/images/mascot/pointing.png
deleted file mode 100644 (file)
index 670702f..0000000
Binary files a/client/src/assets/images/mascot/pointing.png and /dev/null differ