diff options
author | kimsible <kimsible@users.noreply.github.com> | 2020-11-21 23:35:58 +0100 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-11-22 01:15:38 +0100 |
commit | 01d0147ef5a9a0b5087ed5c908258ae228a1b83c (patch) | |
tree | 1bfb34965092aa7a820ae7f68b83fe8004e1f753 | |
parent | 63703d8cee3e6c45c9ae02050df6dc0f66b4737b (diff) | |
download | PeerTube-01d0147ef5a9a0b5087ed5c908258ae228a1b83c.tar.gz PeerTube-01d0147ef5a9a0b5087ed5c908258ae228a1b83c.tar.zst PeerTube-01d0147ef5a9a0b5087ed5c908258ae228a1b83c.zip |
Add tooltip to maximize button and remove grey background
3 files changed, 20 insertions, 5 deletions
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 a519f3e0a..513b543cd 100644 --- a/client/src/app/shared/shared-forms/markdown-textarea.component.html +++ b/client/src/app/shared/shared-forms/markdown-textarea.component.html | |||
@@ -24,11 +24,11 @@ | |||
24 | </ng-container> | 24 | </ng-container> |
25 | 25 | ||
26 | <my-button | 26 | <my-button |
27 | *ngIf="!isMaximized" icon="fullscreen" (click)="onMaximizeClick()" | 27 | *ngIf="!isMaximized" [title]="maximizeInText" className="maximize-button" icon="fullscreen" (click)="onMaximizeClick()" |
28 | ></my-button> | 28 | ></my-button> |
29 | 29 | ||
30 | <my-button | 30 | <my-button |
31 | *ngIf="isMaximized" icon="exit-fullscreen" (click)="onMaximizeClick()" | 31 | *ngIf="isMaximized" [title]="maximizeOutText" className="maximize-button" icon="exit-fullscreen" (click)="onMaximizeClick()" |
32 | ></my-button> | 32 | ></my-button> |
33 | </div> | 33 | </div> |
34 | 34 | ||
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.scss b/client/src/app/shared/shared-forms/markdown-textarea.component.scss index 39e72b5bc..fcddfea03 100644 --- a/client/src/app/shared/shared-forms/markdown-textarea.component.scss +++ b/client/src/app/shared/shared-forms/markdown-textarea.component.scss | |||
@@ -42,8 +42,20 @@ $input-border-radius: 3px; | |||
42 | display: none !important; | 42 | display: none !important; |
43 | } | 43 | } |
44 | 44 | ||
45 | .grey-button { | 45 | .maximize-button { |
46 | padding: 0 7px 0 12px; | 46 | padding: 0 7px; |
47 | cursor: pointer; | ||
48 | |||
49 | svg { | ||
50 | stroke: var(--mainForegroundColor); | ||
51 | opacity: 0.6; | ||
52 | } | ||
53 | |||
54 | &:hover, &:active { | ||
55 | svg { | ||
56 | opacity: 1; | ||
57 | } | ||
58 | } | ||
47 | } | 59 | } |
48 | } | 60 | } |
49 | } | 61 | } |
@@ -77,7 +89,7 @@ $input-border-radius: 3px; | |||
77 | opacity: .7; | 89 | opacity: .7; |
78 | } | 90 | } |
79 | 91 | ||
80 | .grey-button { | 92 | .maximize-button { |
81 | margin-left: 5px; | 93 | margin-left: 5px; |
82 | } | 94 | } |
83 | } | 95 | } |
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.ts b/client/src/app/shared/shared-forms/markdown-textarea.component.ts index b626071eb..9b3ab9cf3 100644 --- a/client/src/app/shared/shared-forms/markdown-textarea.component.ts +++ b/client/src/app/shared/shared-forms/markdown-textarea.component.ts | |||
@@ -35,6 +35,9 @@ export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit { | |||
35 | previewHTML = '' | 35 | previewHTML = '' |
36 | isMaximized = false | 36 | isMaximized = false |
37 | 37 | ||
38 | maximizeInText = $localize`Maximize editor` | ||
39 | maximizeOutText = $localize`Exit maximized editor` | ||
40 | |||
38 | private contentChanged = new Subject<string>() | 41 | private contentChanged = new Subject<string>() |
39 | private scrollPosition: [number, number] | 42 | private scrollPosition: [number, number] |
40 | 43 | ||