From a099e677e0fb247d940666341e942909e0dc19da Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Mon, 24 Aug 2015 17:31:03 -0700 Subject: [PATCH] fix(button-dropdown): Broken styles on reply/reply-all button dropdown --- src/flux/stores/database-store.coffee | 2 +- static/components/button-dropdown.less | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/flux/stores/database-store.coffee b/src/flux/stores/database-store.coffee index 29999f611..6edacbf85 100644 --- a/src/flux/stores/database-store.coffee +++ b/src/flux/stores/database-store.coffee @@ -417,7 +417,7 @@ class DatabaseStore extends NylasStore # We can only use WHERE IN for up to ~250 items at a time. Run a query for # every 100 items and then combine the results before returning. Promise.all(promises).then (results) => - all = {}; + all = {} all = _.extend(all, result) for result in results Promise.resolve(all) diff --git a/static/components/button-dropdown.less b/static/components/button-dropdown.less index 6db99100d..c4f19aa3f 100644 --- a/static/components/button-dropdown.less +++ b/static/components/button-dropdown.less @@ -21,6 +21,7 @@ height: 32px; padding-top: 7px; line-height: 18px; + border-radius: 4px 0 0 4px; } } @@ -65,7 +66,7 @@ line-height: 14px; position: absolute; right: -1px; // -1, because of the border above - + white-space:nowrap; display:none; .menu {