From 5440e372f66f978b6ea830fa9e799ab8ca0f237c Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:44:55 -0700 Subject: [PATCH] [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 --- apps/browser/src/_locales/en/messages.json | 4 +-- apps/browser/src/popup/images/flag-eu.svg | 28 ------------------ apps/browser/src/popup/images/flag-us.svg | 9 ------ apps/browser/src/popup/scss/environment.scss | 13 --------- .../src/popup/settings/about.component.html | 2 +- apps/desktop/src/images/flag-eu.svg | 28 ------------------ apps/desktop/src/images/flag-us.svg | 9 ------ apps/desktop/src/locales/en/messages.json | 4 +-- apps/desktop/src/scss/environment.scss | 13 --------- .../trial-initiation.component.html | 1 - .../environment-selector.component.html | 29 +------------------ .../environment-selector.component.ts | 13 +-------- .../layouts/frontend-layout.component.html | 2 +- apps/web/src/images/flag-eu.svg | 28 ------------------ apps/web/src/images/flag-us.svg | 9 ------ apps/web/src/locales/en/messages.json | 6 ---- .../environment-selector.component.html | 11 ++----- 17 files changed, 10 insertions(+), 199 deletions(-) delete mode 100644 apps/browser/src/popup/images/flag-eu.svg delete mode 100644 apps/browser/src/popup/images/flag-us.svg delete mode 100644 apps/desktop/src/images/flag-eu.svg delete mode 100644 apps/desktop/src/images/flag-us.svg delete mode 100644 apps/web/src/images/flag-eu.svg delete mode 100644 apps/web/src/images/flag-us.svg diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 6aea5876eac..43c3cc0b68e 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -2092,8 +2092,8 @@ "serverVersion": { "message": "Server version" }, - "selfHosted": { - "message": "Self-hosted" + "selfHostedServer": { + "message": "self-hosted" }, "thirdParty": { "message": "Third-party" diff --git a/apps/browser/src/popup/images/flag-eu.svg b/apps/browser/src/popup/images/flag-eu.svg deleted file mode 100644 index bbfefd6b47a..00000000000 --- a/apps/browser/src/popup/images/flag-eu.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/browser/src/popup/images/flag-us.svg b/apps/browser/src/popup/images/flag-us.svg deleted file mode 100644 index 615946d4b59..00000000000 --- a/apps/browser/src/popup/images/flag-us.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/apps/browser/src/popup/scss/environment.scss b/apps/browser/src/popup/scss/environment.scss index 19d39655f2a..1ac0f4240bd 100644 --- a/apps/browser/src/popup/scss/environment.scss +++ b/apps/browser/src/popup/scss/environment.scss @@ -90,19 +90,6 @@ html.browser_safari { background-color: themed("listItemBackgroundHoverColor") !important; } } - - img { - margin-bottom: -2px; - height: 14px; - } - - .img-us { - content: url("../images/flag-us.svg"); - } - - .img-eu { - content: url("../images/flag-eu.svg"); - } } .environment-selector-padding { diff --git a/apps/browser/src/popup/settings/about.component.html b/apps/browser/src/popup/settings/about.component.html index c8840833cf7..24fea4eb9da 100644 --- a/apps/browser/src/popup/settings/about.component.html +++ b/apps/browser/src/popup/settings/about.component.html @@ -33,7 +33,7 @@

- {{ "serverVersion" | i18n }} ({{ "selfHosted" | i18n }}): + {{ "serverVersion" | i18n }} ({{ "selfHostedServer" | i18n }}): {{ this.serverConfig?.version }} ({{ "lastSeenOn" | i18n : (serverConfig.utcDate | date : "mediumDate") }}) diff --git a/apps/desktop/src/images/flag-eu.svg b/apps/desktop/src/images/flag-eu.svg deleted file mode 100644 index bbfefd6b47a..00000000000 --- a/apps/desktop/src/images/flag-eu.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/desktop/src/images/flag-us.svg b/apps/desktop/src/images/flag-us.svg deleted file mode 100644 index 615946d4b59..00000000000 --- a/apps/desktop/src/images/flag-us.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index dbcb70d5e0c..b032c6d2de3 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -2286,8 +2286,8 @@ "euDomain": { "message": "bitwarden.eu" }, - "selfHosted": { - "message": "Self-hosted" + "selfHostedServer": { + "message": "self-hosted" }, "accessDenied": { "message": "Access denied. You do not have permission to view this page." diff --git a/apps/desktop/src/scss/environment.scss b/apps/desktop/src/scss/environment.scss index b9e3eaa7b23..b18032f1a71 100644 --- a/apps/desktop/src/scss/environment.scss +++ b/apps/desktop/src/scss/environment.scss @@ -83,17 +83,4 @@ background-color: themed("listItemBackgroundHoverColor") !important; } } - - img { - margin-bottom: -2px; - height: 14px; - } - - .img-us { - content: url("../images/flag-us.svg"); - } - - .img-eu { - content: url("../images/flag-eu.svg"); - } } diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html index b8127d00c1c..af8c255f632 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html @@ -63,7 +63,6 @@ {{ "startYour7DayFreeTrialOfBitwardenFor" | i18n : org }} diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.html b/apps/web/src/app/components/environment-selector/environment-selector.component.html index 5a5bada82df..d17a9c2b43c 100644 --- a/apps/web/src/app/components/environment-selector/environment-selector.component.html +++ b/apps/web/src/app/components/environment-selector/environment-selector.component.html @@ -12,11 +12,6 @@ aria-hidden="true" [style.visibility]="isUsServer ? 'visible' : 'hidden'" > - {{ 'usFlag' | i18n }} {{ "usDomain" | i18n }} - - - - {{ 'selectedRegionFlag' | i18n }} - - -

+
{{ "server" | i18n }}: {{ isEuServer ? ("euDomain" | i18n) : ("usDomain" | i18n) }}
- + © {{ year }} Bitwarden Inc.
{{ "versionNumber" | i18n : version }}
diff --git a/apps/web/src/images/flag-eu.svg b/apps/web/src/images/flag-eu.svg deleted file mode 100644 index bbfefd6b47a..00000000000 --- a/apps/web/src/images/flag-eu.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/web/src/images/flag-us.svg b/apps/web/src/images/flag-us.svg deleted file mode 100644 index 615946d4b59..00000000000 --- a/apps/web/src/images/flag-us.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index dee5121acd0..43ef1799ea2 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -7019,12 +7019,6 @@ "next": { "message": "Next" }, - "usFlag": { - "message": "US flag" - }, - "euFlag": { - "message": "EU flag" - }, "selectedRegionFlag": { "message": "Selected region flag" }, diff --git a/libs/angular/src/auth/components/environment-selector.component.html b/libs/angular/src/auth/components/environment-selector.component.html index c7307edce90..4e8d33bde68 100644 --- a/libs/angular/src/auth/components/environment-selector.component.html +++ b/libs/angular/src/auth/components/environment-selector.component.html @@ -15,7 +15,7 @@ "euDomain" | i18n }} @@ -44,7 +44,6 @@ selectedEnvironment === ServerEnvironmentType.US ? 'visible' : 'hidden' " > - {{ "usDomain" | i18n }}
@@ -62,7 +61,6 @@ selectedEnvironment === ServerEnvironmentType.EU ? 'visible' : 'hidden' " > - {{ "euDomain" | i18n }}
@@ -79,12 +77,7 @@ selectedEnvironment === ServerEnvironmentType.SelfHosted ? 'visible' : 'hidden' " > - - {{ "selfHosted" | i18n }} + {{ "selfHostedServer" | i18n }}