mirror of
https://github.com/bitwarden/browser.git
synced 2024-09-17 02:34:47 +02:00
dont show popout in firefox sidebar
This commit is contained in:
parent
57a0c0fc75
commit
38f55d7147
@ -20,11 +20,14 @@ export class PopOutComponent implements OnInit {
|
|||||||
@Input() show = true;
|
@Input() show = true;
|
||||||
|
|
||||||
constructor(private analytics: Angulartics2, private platformUtilsService: PlatformUtilsService,
|
constructor(private analytics: Angulartics2, private platformUtilsService: PlatformUtilsService,
|
||||||
private popupUtilsService: PopupUtilsService) {}
|
private popupUtilsService: PopupUtilsService) { }
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
if (this.show) {
|
if (this.show) {
|
||||||
this.show = !this.platformUtilsService.isSafari();
|
this.show = !this.platformUtilsService.isSafari();
|
||||||
|
if (this.show && this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) {
|
||||||
|
this.show = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ header {
|
|||||||
.fa {
|
.fa {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 15px;
|
top: 15px;
|
||||||
left: 10px;
|
left: 20px;
|
||||||
color: lighten($brand-primary, 30%);
|
color: lighten($brand-primary, 30%);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,6 +204,10 @@ header {
|
|||||||
|
|
||||||
.left + .search {
|
.left + .search {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|
||||||
|
.fa {
|
||||||
|
left: 10px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.search + .right {
|
.search + .right {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<header>
|
<header>
|
||||||
<div class="left">
|
<div class="left" *ngIf="showLeftHeader">
|
||||||
<app-pop-out></app-pop-out>
|
<app-pop-out></app-pop-out>
|
||||||
</div>
|
</div>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
|
@ -50,6 +50,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
|
|||||||
searchText: string;
|
searchText: string;
|
||||||
state: any;
|
state: any;
|
||||||
scopeState: any;
|
scopeState: any;
|
||||||
|
showLeftHeader = true;
|
||||||
|
|
||||||
private loadedTimeout: number;
|
private loadedTimeout: number;
|
||||||
private selectedTimeout: number;
|
private selectedTimeout: number;
|
||||||
@ -77,6 +78,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
|
|||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
this.showLeftHeader = !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
|
||||||
this.stateService.remove('CiphersComponent');
|
this.stateService.remove('CiphersComponent');
|
||||||
|
|
||||||
this.broadcasterService.subscribe(ComponentId, (message: any) => {
|
this.broadcasterService.subscribe(ComponentId, (message: any) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user