Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

3 files changed, 0 insertions, 95 deletions

diff --git a/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.html b/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.html
deleted file mode 100644
index 36629594b0..0000000000
--- a/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="search-bar-container {{class}}">
-    <input class="search-bar-input" type="text" [placeholder]="placeholder" [(ngModel)]="searchQuery" (ngModelChange)="searchQueryChange($event)"/>
-    <span class="clear-search-x" *ngIf="searchQuery" (click)="clearSearchQuery()">x</span>
-    <button class="search-bar-button" (click)="searchButtonClick()"></button>
-</div>
\ No newline at end of file
diff --git a/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.less b/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.less
deleted file mode 100644
index cfeb8d3b01..0000000000
--- a/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.less
+++ /dev/null
@@ -1,58 +0,0 @@
-.search-bar-container {
-    display:flex;
-    border-radius: 4px;
-    box-shadow: 0px 2px 3.88px 0.12px rgba(0, 0, 0, 0.29);
-
-    .search-bar-input {
-        border: 1px solid #cdcdcd;
-        border-radius: 4px;
-        border-right:none;
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-        outline:none;
-        padding:2px 50px 2px 10px;
-        color:  #5a5a5a;
-        font-size: 1em;
-        font-style: italic;
-    }
-
-    .clear-search-x {
-        position:absolute;
-        right:40px;
-        top:5px;
-        padding: 0 5px;
-        
-        &:hover {
-            border-radius:2px;
-            background-color: #ebebeb;
-            cursor:pointer;
-        }
-    }
-
-    .search-bar-button {
-        //background: url('../../../../assets/styles/svg/source/search-magnify.svg') no-repeat 50%;
-        background: url('../../../../assets/styles/images/sprites/sprite-global.png') no-repeat -206px -1275px;
-        background-color:  rgba(234, 234, 234, 0.88);
-        width: 30px;
-        height: 30px;
-        padding: 0;
-        cursor:pointer;
-        border:solid 1px #cdcdcd;
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-
-        &:hover {
-            background-position:-126px -1275px;
-        }
-
-        &:active {
-            background-color:  rgba(31, 171, 223, 0.88);
-            background-position:-45px -1275px;
-            border-left:none;
-        }
-        &:focus {
-            outline:none;
-        }
-
-    }
-}
diff --git a/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.ts b/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.ts
deleted file mode 100644
index 08bdf2030f..0000000000
--- a/catalog-ui/src/app/ng2/shared/search-bar/search-bar.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Component, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core';
-
-@Component({
-    selector: 'search-bar',
-    templateUrl: './search-bar.component.html',
-    styleUrls: ['./search-bar.component.less'],
-    encapsulation: ViewEncapsulation.None
-})
-export class SearchBarComponent {
-
-    @Input() placeholder: string;
-    @Input() class: string;
-    @Input() searchQuery: string;
-    @Output() searchChanged: EventEmitter<any> = new EventEmitter<any>();
-    @Output() searchButtonClicked: EventEmitter<string> = new EventEmitter<string>();
-
-    searchButtonClick = (): void => {
-        if (this.searchQuery) { //do not allow empty search
-            this.searchButtonClicked.emit(this.searchQuery);
-        }
-    }
-
-    searchQueryChange = ($event): void => {
-        this.searchChanged.emit($event);
-    }
-
-    private clearSearchQuery = (): void => {
-        this.searchQuery = "";
-        this.searchButtonClicked.emit(this.searchQuery);
-    }
-}
-