From 658a267f9d7e5b60037637c006c6ce8f067cedbe Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Mon, 5 Oct 2015 00:38:48 -0700
Subject: [PATCH] fix(styles): padding fixes

---
 .../account-sidebar/stylesheets/account-sidebar.less        | 4 ++++
 .../message-list/stylesheets/message-list.less              | 3 ++-
 src/flux/stores/account-store.coffee                        | 6 ++++++
 static/components/extra.less                                | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/internal_packages/account-sidebar/stylesheets/account-sidebar.less b/internal_packages/account-sidebar/stylesheets/account-sidebar.less
index edcd8795c..98245e930 100644
--- a/internal_packages/account-sidebar/stylesheets/account-sidebar.less
+++ b/internal_packages/account-sidebar/stylesheets/account-sidebar.less
@@ -85,6 +85,10 @@
   .primary-item {
     padding-top: @padding-large-vertical;
     padding-bottom: @padding-base-vertical;
+    padding-left: 10px;
+    .name {
+      padding-left: 7px;
+    }
   }
 
   .name {
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 75c884701..76312abc4 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -353,6 +353,7 @@
     .message-header-right {
       z-index: 4;
       position: relative;
+      top: -5px;
       float: right;
       text-align: right;
       display: flex;
@@ -370,7 +371,7 @@
       width: 100%;
       border: 0;
       padding: 0;
-      margin-top: 20px;
+      margin-top: 5px;
       overflow: auto;
     }
   }
diff --git a/src/flux/stores/account-store.coffee b/src/flux/stores/account-store.coffee
index d95693d29..58f2ffa35 100644
--- a/src/flux/stores/account-store.coffee
+++ b/src/flux/stores/account-store.coffee
@@ -76,6 +76,12 @@ class AccountStore
       @trigger()
 
   addAccountFromJSON: (json) =>
+    if not json.email_address or not json.provider
+      console.error("Returned account data is invalid", json)
+      atom.emitError
+        msg: "Returned account data is invalid"
+        json: json
+      return
     return if @_tokens[json.id]
     @_tokens[json.id] = json.auth_token
     @_accounts.push((new Account).fromJSON(json))
diff --git a/static/components/extra.less b/static/components/extra.less
index bbca240f1..38c2c131f 100644
--- a/static/components/extra.less
+++ b/static/components/extra.less
@@ -9,6 +9,7 @@
   padding: 6px 10px;
   font-weight: 600;
   font-size: @font-size-smaller;
+  margin: 5px 0 3px 0;
 
   &:hover {
     cursor: pointer;