From e871d4749badc95bcd1e063dc7d8f73161087f7c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 14 Apr 2018 12:52:46 -0400
Subject: [PATCH] safari fixes

---
 src/popup/scss/environment.scss            | 12 ++++++++++++
 src/popup/scss/misc.scss                   |  4 ++++
 src/popup/vault/current-tab.component.html |  2 +-
 src/popup/vault/current-tab.component.ts   | 10 +++++-----
 src/popup/vault/groupings.component.ts     |  3 ++-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/popup/scss/environment.scss b/src/popup/scss/environment.scss
index 312cd5541f..aead2bf929 100644
--- a/src/popup/scss/environment.scss
+++ b/src/popup/scss/environment.scss
@@ -8,3 +8,15 @@ html.browser_firefox, html.browser_edge {
     }
 }
 */
+
+html.browser_safari {
+    header { 
+        .search .fa {
+            left: 25px;
+        }
+
+        .left + .search .fa {
+            left: 15px;
+        }
+    }
+}
diff --git a/src/popup/scss/misc.scss b/src/popup/scss/misc.scss
index 22b4529341..260148a6ea 100644
--- a/src/popup/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -90,6 +90,10 @@ p.lead {
     border-radius: 6px;
 }
 
+input[type="search"] {
+    -webkit-appearance: textfield;
+}
+
 .sr-only {
     position: absolute !important;
     width: 1px !important;
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index 2188d4535e..490007ed55 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -1,5 +1,5 @@
 <header>
-    <div class="left">
+    <div class="left" *ngIf="showLeftHeader">
         <app-pop-out [show]="!inSidebar"></app-pop-out>
         <button type="button" appBlurClick (click)="refresh()" title="{{'refresh' | i18n}}" *ngIf="inSidebar">
             <i class="fa fa-retweet fa-lg fa-fw"></i>
diff --git a/src/popup/vault/current-tab.component.ts b/src/popup/vault/current-tab.component.ts
index 8357e3cb76..e13d0562ef 100644
--- a/src/popup/vault/current-tab.component.ts
+++ b/src/popup/vault/current-tab.component.ts
@@ -43,7 +43,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     searchText: string;
     canAutofill = false;
     inSidebar = false;
-    disableSearch = false;
+    showLeftHeader = false;
     loaded = false;
     loadedTimeout: number;
 
@@ -52,12 +52,12 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
         private analytics: Angulartics2, private toasterService: ToasterService,
         private i18nService: I18nService, private router: Router,
         private ngZone: NgZone, private broadcasterService: BroadcasterService,
-        private changeDetectorRef: ChangeDetectorRef, private syncService: SyncService) {
-        this.inSidebar = popupUtilsService.inSidebar(window);
-        this.disableSearch = platformUtilsService.isEdge();
-    }
+        private changeDetectorRef: ChangeDetectorRef, private syncService: SyncService) {}
 
     async ngOnInit() {
+        this.showLeftHeader = !this.platformUtilsService.isSafari();
+        this.inSidebar = this.popupUtilsService.inSidebar(window);
+
         this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
             this.ngZone.run(async () => {
                 switch (message.command) {
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index 649e514c7c..83167f068e 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -78,7 +78,8 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     }
 
     async ngOnInit() {
-        this.showLeftHeader = !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
+        this.showLeftHeader = !this.platformUtilsService.isSafari() &&
+            !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
         this.stateService.remove('CiphersComponent');
 
         this.broadcasterService.subscribe(ComponentId, (message: any) => {