mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 08:13:42 +00:00
[PM-3804] Remove Server Flag Icons (#6207)
* remove flags from web component * remove selectedRegionImageName from web component * remove input * delete image files and update browser translation * update translation and popup width for destkop/browser * remove translations * revert width on dialog
This commit is contained in:
@@ -12,11 +12,6 @@
|
||||
aria-hidden="true"
|
||||
[style.visibility]="isUsServer ? 'visible' : 'hidden'"
|
||||
></i>
|
||||
<img
|
||||
src="../../images/flag-us.svg"
|
||||
alt="{{ 'usFlag' | i18n }}"
|
||||
class="tw-mr-1 tw-w-6 tw-pb-1"
|
||||
/>
|
||||
{{ "usDomain" | i18n }}
|
||||
</a>
|
||||
<a
|
||||
@@ -32,32 +27,10 @@
|
||||
aria-hidden="true"
|
||||
[style.visibility]="isEuServer ? 'visible' : 'hidden'"
|
||||
></i>
|
||||
<img
|
||||
src="../../images/flag-eu.svg"
|
||||
alt="{{ 'euFlag' | i18n }}"
|
||||
class="tw-mr-1 tw-w-6 tw-pb-1"
|
||||
/>
|
||||
{{ "euDomain" | i18n }}
|
||||
</a>
|
||||
</bit-menu>
|
||||
<span *ngIf="hasFlags" class="!tw-inline-block !tw-min-w-52">
|
||||
<label>{{ "server" | i18n }}:</label>
|
||||
<a
|
||||
[routerLink]="[]"
|
||||
[bitMenuTriggerFor]="environmentOptions"
|
||||
class="tw-rounded-md tw-border tw-border-solid tw-border-secondary-300 tw-bg-background tw-p-2"
|
||||
>
|
||||
<img
|
||||
[src]="'../../images/' + selectedRegionImageName + '.svg'"
|
||||
alt="{{ 'selectedRegionFlag' | i18n }}"
|
||||
class="tw-mx-1 tw-pb-1"
|
||||
/><label class="tw-cursor-pointer !tw-font-normal"
|
||||
>{{ isEuServer ? ("euDomain" | i18n) : ("usDomain" | i18n) }}
|
||||
<i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i
|
||||
></label>
|
||||
</a>
|
||||
</span>
|
||||
<div *ngIf="!hasFlags">
|
||||
<div>
|
||||
{{ "server" | i18n }}:
|
||||
<a [routerLink]="[]" [bitMenuTriggerFor]="environmentOptions">
|
||||
<b>{{ isEuServer ? ("euDomain" | i18n) : ("usDomain" | i18n) }}</b
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, Input, OnInit } from "@angular/core";
|
||||
import { Component, OnInit } from "@angular/core";
|
||||
import { Router } from "@angular/router";
|
||||
|
||||
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
|
||||
@@ -18,12 +18,10 @@ export class EnvironmentSelectorComponent implements OnInit {
|
||||
private router: Router
|
||||
) {}
|
||||
|
||||
@Input() hasFlags: boolean;
|
||||
isEuServer: boolean;
|
||||
isUsServer: boolean;
|
||||
showRegionSelector = false;
|
||||
euServerFlagEnabled: boolean;
|
||||
selectedRegionImageName: string;
|
||||
routeAndParams: string;
|
||||
|
||||
async ngOnInit() {
|
||||
@@ -33,16 +31,7 @@ export class EnvironmentSelectorComponent implements OnInit {
|
||||
const domain = Utils.getDomain(window.location.href);
|
||||
this.isEuServer = domain.includes(RegionDomain.EU);
|
||||
this.isUsServer = domain.includes(RegionDomain.US) || domain.includes(RegionDomain.USQA);
|
||||
this.selectedRegionImageName = this.getRegionImage();
|
||||
this.showRegionSelector = !this.platformUtilsService.isSelfHost();
|
||||
this.routeAndParams = `/#${this.router.url}`;
|
||||
}
|
||||
|
||||
getRegionImage(): string {
|
||||
if (this.isEuServer) {
|
||||
return "flag-eu";
|
||||
} else {
|
||||
return "flag-us";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user