mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 00:03:56 +00:00
adjustments for edge 18 workarounds
This commit is contained in:
@@ -138,7 +138,7 @@ export class AppComponent implements OnInit {
|
||||
}
|
||||
|
||||
getState(outlet: RouterOutlet) {
|
||||
return outlet.activatedRouteData.state;
|
||||
return BrowserApi.isEdge18 ? null : outlet.activatedRouteData.state;
|
||||
}
|
||||
|
||||
private async recordActivity() {
|
||||
|
||||
@@ -56,8 +56,8 @@ export class PopOutComponent implements OnInit {
|
||||
chrome.windows.create({
|
||||
url: href,
|
||||
type: 'popup',
|
||||
width: bodyRect.width + 60,
|
||||
height: bodyRect.height,
|
||||
width: bodyRect.width ? bodyRect.width + 60 : 375,
|
||||
height: bodyRect.height || 600,
|
||||
});
|
||||
|
||||
if (this.popupUtilsService.inPopup(window)) {
|
||||
|
||||
@@ -329,6 +329,12 @@ header {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.tabs-3 {
|
||||
ul li {
|
||||
width: 33.33%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
app-root {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<div class="tab-page">
|
||||
<router-outlet></router-outlet>
|
||||
<nav class="tabs">
|
||||
<nav class="tabs" [ngClass]="{'tabs-3': !showCurrentTab}">
|
||||
<ul>
|
||||
<li routerLinkActive="active">
|
||||
<li routerLinkActive="active" *ngIf="showCurrentTab">
|
||||
<a routerLink="current" title="{{'currentTab' | i18n}}">
|
||||
<i class="fa fa-folder fa-2x"></i>{{'tab' | i18n}}
|
||||
</a>
|
||||
|
||||
@@ -1,7 +1,20 @@
|
||||
import { Component } from '@angular/core';
|
||||
import {
|
||||
Component,
|
||||
OnInit,
|
||||
} from '@angular/core';
|
||||
|
||||
import { PopupUtilsService } from './services/popup-utils.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tabs',
|
||||
templateUrl: 'tabs.component.html',
|
||||
})
|
||||
export class TabsComponent { }
|
||||
export class TabsComponent implements OnInit {
|
||||
showCurrentTab: boolean = true;
|
||||
|
||||
constructor(private popupUtilsService: PopupUtilsService) { }
|
||||
|
||||
ngOnInit() {
|
||||
this.showCurrentTab = !this.popupUtilsService.inPopout(window);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user