Refactor popover markdown, add code style

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 b4f8bda5e30a10126196a46a7feea10ecc03304d..4af0d277cc5be2c7207a97d19896e222a4dbacb3 100644 (file)
--- 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
@@ -3,28 +3,34 @@
     <img [src]="getAvatarUrl()" alt="Avatar" />
 
     <div class="form-group">
+      <textarea i18n-placeholder placeholder="Add comment..." myAutoResize [readonly]="(user === null) ? true : false"
+        (click)="openVisitorModal($event)" formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
+        (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
+
+      </textarea>
       <my-help class="markdown-guide" helpType="custom" iconName="markdown" i18n-title title="Markdown compatible">
         <ng-template ptTemplate="customHtml">
-          <div i18n>
-            Markdown compatible that supports:
+          <span i18n>Markdown compatible that supports:</span>
 
-            <ul>
-              <li>Emphasis: <strong>**bold**</strong>, <i>_italic_</i></li>
-              <li>Links</li>
-              <li>Break lines</li>
-              <li>Lists</li>
-              <li>Emojis</li>
-            </ul>
-          </div>
+          <ul>
+            <li><span i18n>Auto generated links</span></li>
+            <li><span i18n>Break lines</span></li>
+            <li><span i18n>Lists</span></li>
+            <li>
+              <span i18n>Emphasis</span>
+              <code>**<strong i18n>bold</strong>** _<i i18n>italic</i>_</code>
+            </li>
+            <li>
+              <span i18n>Emoji shortcuts</span>
+              <code>:) &lt;3</code>
+            </li>
+            <li>
+              <span i18n>Emoji markup</span>
+              <code>:smile:</code>
+            </li>
+          </ul>
         </ng-template>
       </my-help>
-      <textarea i18n-placeholder placeholder="Add comment..." myAutoResize
-                [readonly]="(user === null) ? true : false"
-                (click)="openVisitorModal($event)"
-                formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
-                (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
-
-      </textarea>
       <div *ngIf="formErrors.text" class="form-error">
         {{ formErrors.text }}
       </div>

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index d2811d24a0f68b3bff35e7c6237b0f3720f360e7..3be8f057bde9306117059088ad438fc02812fc57 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -103,6 +103,16 @@ label {
   font-size: 15px;
 }
 
+code {
+  background-color: pvar(--greyBackgroundColor);
+  border-radius: 3px;
+  padding: .2em .4em;
+  margin: auto .4em;
+  font-size: 75%;
+  display: inline-block;
+  vertical-align: middle;
+}
+
 .form-error {
   display: block;
   color: $red;