borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor popover markdown, add code style

Browse Source
This commit is contained in:
kimsible 2020-08-09 14:20:56 +02:00 committed by Chocobozzz
parent 04c7f70175
commit fd9c3c8d66
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
View File

@ -3,28 +3,34 @@
<img [src]="getAvatarUrl()" alt="Avatar" /> <img [src]="getAvatarUrl()" alt="Avatar" />
<div class="form-group"> <div class="form-group">
<my-help class="markdown-guide" helpType="custom" iconName="markdown" i18n-title title="Markdown compatible"> <textarea i18n-placeholder placeholder="Add comment..." myAutoResize [readonly]="(user === null) ? true : false"
<ng-template ptTemplate="customHtml"> (click)="openVisitorModal($event)" formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
<div i18n> (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
Markdown compatible that supports:
<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>
</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> </textarea>
<my-help class="markdown-guide" helpType="custom" iconName="markdown" i18n-title title="Markdown compatible">
<ng-template ptTemplate="customHtml">
<span i18n>Markdown compatible that supports:</span>
<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>
<div *ngIf="formErrors.text" class="form-error"> <div *ngIf="formErrors.text" class="form-error">
{{ formErrors.text }} {{ formErrors.text }}
</div> </div>

10
client/src/sass/application.scss
View File

@ -103,6 +103,16 @@ label {
font-size: 15px; 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 { .form-error {
display: block; display: block;
color: $red; color: $red;