From 38f55d71478cebf68559b1b9d7f477cffef418f0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 13 Apr 2018 23:37:57 -0400
Subject: [PATCH] dont show popout in firefox sidebar

---
 src/popup/components/pop-out.component.ts | 5 ++++-
 src/popup/scss/base.scss                  | 6 +++++-
 src/popup/vault/groupings.component.html  | 2 +-
 src/popup/vault/groupings.component.ts    | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/popup/components/pop-out.component.ts b/src/popup/components/pop-out.component.ts
index 3c32e46539..a03716bd37 100644
--- a/src/popup/components/pop-out.component.ts
+++ b/src/popup/components/pop-out.component.ts
@@ -20,11 +20,14 @@ export class PopOutComponent implements OnInit {
     @Input() show = true;
 
     constructor(private analytics: Angulartics2, private platformUtilsService: PlatformUtilsService,
-        private popupUtilsService: PopupUtilsService) {}
+        private popupUtilsService: PopupUtilsService) { }
 
     ngOnInit() {
         if (this.show) {
             this.show = !this.platformUtilsService.isSafari();
+            if (this.show && this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) {
+                this.show = false;
+            }
         }
     }
 
diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss
index bcc1301475..444a961a97 100644
--- a/src/popup/scss/base.scss
+++ b/src/popup/scss/base.scss
@@ -177,7 +177,7 @@ header {
         .fa {
             position: absolute;
             top: 15px;
-            left: 10px;
+            left: 20px;
             color: lighten($brand-primary, 30%);
         }
 
@@ -204,6 +204,10 @@ header {
 
     .left + .search {
         padding-left: 0;
+
+        .fa {
+            left: 10px;
+        }
     }
 
     .search + .right {
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index 1529109901..e9a9a6a2e9 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -1,5 +1,5 @@
 <header>
-    <div class="left">
+    <div class="left" *ngIf="showLeftHeader">
         <app-pop-out></app-pop-out>
     </div>
     <div class="search">
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index 74851f9a49..649e514c7c 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -50,6 +50,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     searchText: string;
     state: any;
     scopeState: any;
+    showLeftHeader = true;
 
     private loadedTimeout: number;
     private selectedTimeout: number;
@@ -77,6 +78,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     }
 
     async ngOnInit() {
+        this.showLeftHeader = !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
         this.stateService.remove('CiphersComponent');
 
         this.broadcasterService.subscribe(ComponentId, (message: any) => {