From dc5366868593d459262f5525c3701b22c007437f Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 5 Apr 2021 11:17:13 +0200 Subject: [PATCH] search ui tweaks --- terminus-core/src/theme.scss | 2 +- .../src/api/baseTerminalTab.component.ts | 15 ++++++++++++--- .../src/components/searchPanel.component.pug | 11 +++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/terminus-core/src/theme.scss b/terminus-core/src/theme.scss index 104abcfe..261ddfea 100644 --- a/terminus-core/src/theme.scss +++ b/terminus-core/src/theme.scss @@ -293,7 +293,7 @@ checkbox i.on { } search-panel { - background: rgba(39, 49, 60, 0.65) !important; + background: rgba(39, 49, 60, 0.95) !important; } diff --git a/terminus-terminal/src/api/baseTerminalTab.component.ts b/terminus-terminal/src/api/baseTerminalTab.component.ts index b75adb8e..ef318173 100644 --- a/terminus-terminal/src/api/baseTerminalTab.component.ts +++ b/terminus-terminal/src/api/baseTerminalTab.component.ts @@ -22,11 +22,20 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit static styles: string[] = [require('../components/terminalTab.component.scss')] static animations: AnimationTriggerMetadata[] = [trigger('slideInOut', [ transition(':enter', [ - style({ transform: 'translateY(-25%)' }), - animate('100ms ease-in-out', style({ transform: 'translateY(0%)' })), + style({ + transform: 'translateY(-25%)', + opacity: '0', + }), + animate('100ms ease-out', style({ + transform: 'translateY(0%)', + opacity: '1', + })), ]), transition(':leave', [ - animate('100ms ease-in-out', style({ transform: 'translateY(-25%)' })), + animate('100ms ease-out', style({ + transform: 'translateY(-25%)', + opacity: '0', + })), ]), ])] diff --git a/terminus-terminal/src/components/searchPanel.component.pug b/terminus-terminal/src/components/searchPanel.component.pug index f886a186..fc48bf13 100644 --- a/terminus-terminal/src/components/searchPanel.component.pug +++ b/terminus-terminal/src/components/searchPanel.component.pug @@ -1,5 +1,5 @@ input.search-input.form-control( - type='search', + type='text', [(ngModel)]='query', (ngModelChange)='onQueryChange()', [class.text-danger]='notFound', @@ -11,14 +11,14 @@ input.search-input.form-control( button.btn.btn-link( (click)='findPrevious()', - ngbTooltip='Next', + ngbTooltip='Search up', placement='bottom' ) i.fa.fa-fw.fa-arrow-up button.btn.btn-link( (click)='findNext()', - ngbTooltip='Next', + ngbTooltip='Search down', placement='bottom' ) i.fa.fa-fw.fa-arrow-down @@ -48,4 +48,7 @@ button.btn.btn-link( ) i.fa.fa-fw.fa-text-width -button.close.text-light.pl-3.pr-2((click)='close.emit()') × +.mr-2 + +button.btn.btn-link((click)='close.emit()') + i.fa.fa-fw.fa-times