Merge branch 'release/5.0.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-forms / markdown-textarea.component.html

diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.html b/client/src/app/shared/shared-forms/markdown-textarea.component.html
index 6e70e2f37570b4411c2ea585122aea6490f92140..5a9ff1a156189596124248d4a738e76216b20e24 100644 (file)
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.html
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.html
@@ -1,8 +1,9 @@
-<div class="root" [ngClass]="{ 'maximized': isMaximized }" [ngStyle]="{ 'max-width': textareaMaxWidth }">
+<div class="root" [ngClass]="{ 'maximized': isMaximized }">
+
   <textarea #textarea
     [(ngModel)]="content" (ngModelChange)="onModelChange()"
-    class="form-control" [ngClass]="classes"
-    [ngStyle]="{ height: textareaHeight }"
+    class="form-control" [ngClass]="{ 'input-error': formError }"
+    [attr.disabled]="disabled || null"
     [id]="name" [name]="name">
   </textarea>
 
@@ -24,14 +25,18 @@
       </ng-template>
     </ng-container>
 
-    <my-button
-      *ngIf="!isMaximized" [title]="maximizeInText" className="maximize-button" icon="fullscreen" (click)="onMaximizeClick()"
-    ></my-button>
+    <my-global-icon
+      *ngIf="!isMaximized" role="button" [ngbTooltip]="maximizeInText"
+      class="maximize-button" iconName="fullscreen" (click)="onMaximizeClick()" [ngClass]="{ disabled: disabled }"
+    ></my-global-icon>
 
-    <my-button
-      *ngIf="isMaximized" [title]="maximizeOutText" className="maximize-button" icon="exit-fullscreen" (click)="onMaximizeClick()"
-    ></my-button>
+    <my-global-icon
+      *ngIf="isMaximized" role="button" [ngbTooltip]="maximizeOutText"
+      class="maximize-button" iconName="exit-fullscreen" (click)="onMaximizeClick()" [ngClass]="{ disabled: disabled }"
+    ></my-global-icon>
   </div>
 
   <div [ngbNavOutlet]="nav"></div>
+
+  <div *ngIf="!isMaximized && formError" class="form-error">{{ formError }}</div>
 </div>