www

commit 945da5e008583ab7bdc63c19e5e1b8e5b982fe7a
parent aea378f1055c253336f2dbd750f2506e39a5ce4e
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun,  6 Aug 2017 18:52:18 +0200

Fix spacing of note editor and parent row in conflict resolution window

Diffstat:
M
chrome/skin/default/zotero/merge.css
 | 
6
+-----

1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/chrome/skin/default/zotero/merge.css b/chrome/skin/default/zotero/merge.css
@@ -94,13 +94,9 @@ zoteromergepane {
 }
 
 zoteromergepane div[anonid=parent-row] {
-	margin-bottom: 5px;
+	margin: 7px 5px;
 }
 
 zoteromergepane div[anonid=parent-row] span {
 	font-weight: bold;
 }
-
-zoteromergepane zoteronoteeditor {
-	margin: 10px 0 0;
-}