diff --git a/src/popup/app/tools/toolsController.js b/src/popup/app/tools/toolsController.js
index 115d93e0826..dea703e8abf 100644
--- a/src/popup/app/tools/toolsController.js
+++ b/src/popup/app/tools/toolsController.js
@@ -1,7 +1,7 @@
angular
.module('bit.tools')
- .controller('toolsController', function ($scope) {
+ .controller('toolsController', function ($scope, SweetAlert) {
$scope.launchWebVault = function () {
chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
};
@@ -13,4 +13,19 @@
$scope.launchAndroid = function () {
chrome.tabs.create({ url: 'https://play.google.com/store/apps/details?id=com.x8bit.bitwarden' });
};
+
+ $scope.launchImport = function () {
+ SweetAlert.swal({
+ title: 'Import Logins',
+ text: 'You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?',
+ type: 'info',
+ showCancelButton: true,
+ confirmButtonText: 'Yes',
+ cancelButtonText: 'Cancel'
+ }, function (confirm) {
+ if (confirm) {
+ chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
+ }
+ });
+ };
});
diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/views/tools.html
index 22400486e9b..986941e6d29 100644
--- a/src/popup/app/tools/views/tools.html
+++ b/src/popup/app/tools/views/tools.html
@@ -25,7 +25,7 @@
bitwarden Android Vault
Manage your logins from your mobile devices with the bitwarden Android vault.
-
+
Import Logins
Quickly bulk import your logins from other password management applications.
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js
index 1e32b335745..019af0ede01 100644
--- a/src/popup/app/vault/vaultEditSiteController.js
+++ b/src/popup/app/vault/vaultEditSiteController.js
@@ -70,8 +70,7 @@ angular
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No'
- },
- function (confirm) {
+ }, function (confirm) {
if (confirm) {
goPasswordGenerator();
}
diff --git a/src/popup/less/plugins.less b/src/popup/less/plugins.less
index 4bf2b472077..16345bb56b8 100644
--- a/src/popup/less/plugins.less
+++ b/src/popup/less/plugins.less
@@ -104,10 +104,10 @@
.sa-icon.sa-info {
border-color: @brand-info;
- }
- .pulseInfoIns {
- background-color: @brand-info !important;
+ &:before, &:after {
+ background-color: @brand-info;
+ }
}
.sa-icon.sa-success {