From 8de7f522c69e92285dc8d723746ceacfb345b65f Mon Sep 17 00:00:00 2001 From: CarleyDiaz-Bitwarden <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com> Date: Wed, 1 Jun 2022 11:40:32 -0400 Subject: [PATCH] Ps 575 pop out (#2705) * Disable the ability to open infinite popouts in the browser * fixing lint error * Adding padding * Updating code to use ngIf instead of show for the app-pop-out --- apps/browser/src/popup/components/pop-out.component.ts | 5 ++++- apps/browser/src/popup/scss/base.scss | 1 + apps/browser/src/popup/vault/current-tab.component.html | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/browser/src/popup/components/pop-out.component.ts b/apps/browser/src/popup/components/pop-out.component.ts index ee1929ce39..94a4b3a8de 100644 --- a/apps/browser/src/popup/components/pop-out.component.ts +++ b/apps/browser/src/popup/components/pop-out.component.ts @@ -18,7 +18,10 @@ export class PopOutComponent implements OnInit { ngOnInit() { if (this.show) { - if (this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) { + if ( + (this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) || + this.popupUtilsService.inPopout(window) + ) { this.show = false; } } diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss index e816521f0e..8465a1ba33 100644 --- a/apps/browser/src/popup/scss/base.scss +++ b/apps/browser/src/popup/scss/base.scss @@ -215,6 +215,7 @@ header { app-pop-out { display: flex; + padding-right: 0.5em; } .title { diff --git a/apps/browser/src/popup/vault/current-tab.component.html b/apps/browser/src/popup/vault/current-tab.component.html index 0556e0d564..f4cfd9f4bc 100644 --- a/apps/browser/src/popup/vault/current-tab.component.html +++ b/apps/browser/src/popup/vault/current-tab.component.html @@ -1,7 +1,7 @@

{{ "currentTab" | i18n }}

- +