diff --git a/jslib b/jslib
index e9db844285..0092aac275 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e9db844285e21525f5152e782063f04e02543553
+Subproject commit 0092aac275e8efca66838a8c266eec1d455883aa
diff --git a/package-lock.json b/package-lock.json
index 1a8eeeb332..26f03eca2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -661,9 +661,9 @@
"dev": true
},
"@types/lunr": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.1.6.tgz",
- "integrity": "sha512-Bz6fUhX1llTa7ygQJN3ttoVkkrpW7xxSEP7D7OYFO/FCBKqKqruRUZtJzTtYA0GkQX13lxU5u+8LuCviJlAXkQ==",
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.3.3.tgz",
+ "integrity": "sha512-09sXZZVsB3Ib41U0fC+O1O+4UOZT1bl/e+/QubPxpqDWHNEchvx/DEb1KJMOwq6K3MTNzZFoNSzVdR++o1DVnw==",
"dev": true
},
"@types/node": {
diff --git a/package.json b/package.json
index 546f12ea31..baa34fa982 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,8 @@
{
"name": "bitwarden-web",
"version": "2.13.2",
+ "license": "GPL-3.0",
+ "repository": "https://github.com/bitwarden/web",
"scripts": {
"sub:init": "git submodule update --init --recursive",
"sub:update": "git submodule update --remote",
@@ -29,7 +31,7 @@
"@angular/compiler-cli": "^7.2.11",
"@ngtools/webpack": "^7.2.2",
"@types/jquery": "^3.3.6",
- "@types/lunr": "^2.1.6",
+ "@types/lunr": "^2.3.3",
"@types/node-forge": "^0.7.5",
"@types/papaparse": "^4.5.3",
"@types/webcrypto": "^0.0.28",
diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index a112612db9..9733e4b378 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -122,7 +122,7 @@ export class PeopleComponent implements OnInit {
}
get allCount() {
- return this.allUsers.length;
+ return this.allUsers != null ? this.allUsers.length : 0;
}
get invitedCount() {
diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts
index d388286046..8c33388618 100644
--- a/src/app/settings/options.component.ts
+++ b/src/app/settings/options.component.ts
@@ -70,6 +70,15 @@ export class OptionsComponent implements OnInit {
}
async submit() {
+ if (this.vaultTimeoutAction === 'logOut') {
+ const confirmed = await this.platformUtilsService.showDialog(
+ this.i18nService.t('vaultTimeoutLogOutConfirmation'),
+ this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'),
+ this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning');
+ if (!confirmed) {
+ return;
+ }
+ }
await this.vaultTimeoutService.setVaultTimeoutOptions(this.vaultTimeout != null ? this.vaultTimeout : null,
this.vaultTimeoutAction);
await this.storageService.save(ConstantsService.disableFaviconKey, this.disableIcons);
diff --git a/src/browserconfig.xml b/src/browserconfig.xml
index 320299fafb..ea394e344f 100644
--- a/src/browserconfig.xml
+++ b/src/browserconfig.xml
@@ -3,7 +3,7 @@
- #3c8dbc
+ #175DDC
diff --git a/src/index.html b/src/index.html
index 8170d0469a..3c663967f4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -4,14 +4,14 @@
-
+
Bitwarden Web Vault
-
+
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index a169304712..832b597078 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3135,5 +3135,11 @@
"example": "Google"
}
}
+ },
+ "vaultTimeoutLogOutConfirmation": {
+ "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
+ },
+ "vaultTimeoutLogOutConfirmationTitle": {
+ "message": "Timeout Action Confirmation"
}
}
diff --git a/src/manifest.json b/src/manifest.json
index e09dc0ca19..92a1204c60 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -12,6 +12,6 @@
"type": "image/png"
}
],
- "theme_color": "#3c8dbc",
- "background_color": "#3c8dbc"
-}
\ No newline at end of file
+ "theme_color": "#175DDC",
+ "background_color": "#175DDC"
+}
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 80951953bb..d85b084f8b 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -1,9 +1,9 @@
@import "../css/webfonts.css";
-$primary: #3c8dbc;
-$primary-accent: #286090;
+$primary: #175DDC;
+$primary-accent: #1252A3;
$secondary: #ced4da;
-$secondary-alt: #2c3e50;
+$secondary-alt: #1A3B66;
$success: #00a65a;
$info: #555555;
$warning: #bf7e16;