Style doorhanger. Fixes #internal

css/doorhanger.css

@@ -24,11 +24,11 @@ body {
   #password-toolbar .passman-btn {
     float: right;
     display: inline-block;
-    padding: 6px 12px;
+    padding: 0 12px;
+    line-height: 30px;
     margin-bottom: 0;
     font-size: 13px;
     font-weight: normal;
-    line-height: 1.42857143;
     text-align: center;
     white-space: nowrap;
     vertical-align: middle;
@@ -45,15 +45,17 @@ body {
     margin-right: 15px;
     border: 1px solid transparent;
     border-radius: 4px; }
+    #password-toolbar .passman-btn .caret-container {
+      border-bottom: 1px #fff dashed; }
   #password-toolbar .passman-btn:hover {
     background: #3cb0fd;
     text-decoration: none; }
   #password-toolbar .select_account {
     position: absolute;
     top: 45px;
-    color: #000;
+    color: #333;
     width: 160px;
-    right: 75px;
+    right: 49px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -66,12 +68,13 @@ body {
     padding: 5px 0; }
     #password-toolbar .select_account .account {
       display: block;
-      padding: 3px 20px;
+      padding: 3px 5px 3px 10px;
       clear: both;
       font-weight: 400;
       line-height: 1.42857143;
       color: #333;
-      white-space: nowrap; }
+      white-space: nowrap;
+      text-align: left; }
       #password-toolbar .select_account .account:hover {
         color: #262626;
         text-decoration: none;

js/ui/doorhanger/doorhanger.js

@@ -91,12 +91,15 @@ $(document).ready(function () {
                 var html_button;
 
                 if (btn === 'save') {
-                    var btn_text = API.i18n.getMessage('save_to', [default_account.vault.name]);
-                    html_button = $('<button class="passman-btn passnman-btn-success btn-' + btn + '"></button>').text(btn_text);
+                    var btn_text = (button.isCreate && accounts.length > 1) ? API.i18n.getMessage('save_to','') : API.i18n.getMessage('save');
+                    btn_text = (!button.isCreate) ? API.i18n.getMessage('update') : btn_text;
+                    html_button = $('<button class="passman-btn passnman-btn-success"></button>').text(btn_text);
                     if (button.isCreate && accounts.length > 1) {
+                        var caret_container =  $('<span class="caret-container"></span>').text(default_account.vault.name);
                         var caret = $('<span class="fa fa-caret-down" style="margin-left: 5px; cursor: pointer;"></span>');
                         var menu = $('<div class="select_account" style="display: none;"></div>');
-                        html_button.append(caret);
+                        caret_container.append(caret);
+                        html_button.append(caret_container);
                         for (var i = 1; i < accounts.length; i++) {
                             var a = accounts[i];
                             var item = $('<div class="account"></div>').text(API.i18n.getMessage('save_to', [a.vault.name]));
@@ -111,7 +114,7 @@ $(document).ready(function () {
                             /* jshint ignore:end */
                             menu.append(item);
                         }
-                        caret.click(function (e) {
+                        caret_container.click(function (e) {
                             e.stopPropagation();
                             e.preventDefault();
                             var isVisible = ($('.select_account').is(':visible'));

style/doorhanger.scss

@@ -31,11 +31,11 @@ body{
   .passman-btn {
     float: right;
     display: inline-block;
-    padding: 6px 12px;
+    padding: 0 12px;
+    line-height: 30px;
     margin-bottom: 0;
     font-size: 13px;
     font-weight: normal;
-    line-height: 1.42857143;
     text-align: center;
     white-space: nowrap;
     vertical-align: middle;
@@ -49,6 +49,9 @@ body{
     margin-right: 15px;
     border: 1px solid transparent;
     border-radius: 4px;
+    .caret-container{
+      border-bottom: 1px #fff dashed;
+    }
   }
 
   .passman-btn:hover {
@@ -58,9 +61,9 @@ body{
   .select_account{
     position: absolute;
     top: 45px;
-    color: #000;
+    color: #333;
     width: 160px;
-    right: 75px;
+    right: 49px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -78,12 +81,13 @@ body{
         background-color: #f5f5f5;
       }
       display: block;
-      padding: 3px 20px;
+      padding: 3px 5px 3px 10px;
       clear: both;
       font-weight: 400;
       line-height: 1.42857143;
       color: #333;
       white-space: nowrap;
+      text-align: left;
     }
   }
 }