From aa4f360f5930a826aaccd52ce2d2ac7514e07056 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 25 Feb 2017 02:51:42 -0500
Subject: [PATCH] combine import/export

---
 src/app/tools/views/tools.html | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/app/tools/views/tools.html b/src/app/tools/views/tools.html
index d05ffb46..2cbb1e63 100644
--- a/src/app/tools/views/tools.html
+++ b/src/app/tools/views/tools.html
@@ -7,24 +7,17 @@
 <section class="content">
     <div class="box box-default">
         <div class="box-header with-border">
-            <h3 class="box-title">Import</h3>
+            <h3 class="box-title">Import/Export</h3>
         </div>
         <div class="box-body">
-            Quickly import your logins and other data from a previous bitwarden export or from another
-            password manager application.
+            <p>
+                Quickly import your logins and other data from a previous export or from another
+                password management application.
+            </p>
+            <p>You can also export all of your vault data in <code>.csv</code> format.</p>
         </div>
         <div class="box-footer">
             <button class="btn btn-default btn-flat" type="button" ng-click="import()">Import Data</button>
-        </div>
-    </div>
-    <div class="box box-default">
-        <div class="box-header with-border">
-            <h3 class="box-title">Export</h3>
-        </div>
-        <div class="box-body">
-            Export all of your vault data in <code>.csv</code> format.
-        </div>
-        <div class="box-footer">
             <button class="btn btn-default btn-flat" type="button" ng-click="export()">Export Data</button>
         </div>
     </div>