From 5fef6837b77d1851bc453cb997b1da73456f1eb9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 20 Sep 2016 00:03:39 -0400
Subject: [PATCH] alert for bulk import link

---
 src/popup/app/tools/toolsController.js         | 17 ++++++++++++++++-
 src/popup/app/tools/views/tools.html           |  2 +-
 src/popup/app/vault/vaultEditSiteController.js |  3 +--
 src/popup/less/plugins.less                    |  6 +++---
 4 files changed, 21 insertions(+), 7 deletions(-)

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 @@
                     <span class="text">bitwarden Android Vault</span>
                     <span class="detail">Manage your logins from your mobile devices with the bitwarden Android vault.</span>
                 </a>
-                <a class="list-section-item wrap" href="" ng-click="launchWebVault()">
+                <a class="list-section-item wrap" href="" ng-click="launchImport()">
                     <span class="leading-icon" style="color: #6fc2ff;"><i class="fa fa-cloud-upload fa-fw"></i></span>
                     <span class="text">Import Logins</span>
                     <span class="detail">Quickly bulk import your logins from other password management applications.</span>
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 {