From 9c91ae4a8cde2f3075b66966967f8499482cbeb6 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 28 Aug 2015 01:00:38 +0400
Subject: [PATCH] update tree rowheights to match css

# Conflicts:
#	plugins/c9.ide.scm/detail.js
#	plugins/c9.ide.scm/log.js
#	plugins/c9.ide.scm/scm.js
---
 package.json                       | 2 +-
 plugins/c9.ide.dialog.file/file.js | 2 +-
 plugins/c9.ide.tree/style.css      | 2 +-
 plugins/c9.ide.tree/tree.js        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 216ea0da..dac6403e 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
         "c9.ide.mount": "#816dbe987b",
         "c9.ide.navigate": "#6a1c2e253c",
         "c9.ide.newresource": "#f1f0624768",
-        "c9.ide.openfiles": "#28a4f5af16",
+        "c9.ide.openfiles": "#7fa4a97fed",
         "c9.ide.preview": "#c530a7978d",
         "c9.ide.preview.browser": "#c50007ebbc",
         "c9.ide.preview.markdown": "#ab8d30ad9f",
diff --git a/plugins/c9.ide.dialog.file/file.js b/plugins/c9.ide.dialog.file/file.js
index b88434d9..9e60404e 100644
--- a/plugins/c9.ide.dialog.file/file.js
+++ b/plugins/c9.ide.dialog.file/file.js
@@ -141,7 +141,7 @@ define(function(require, module, exports) {
                 
                 var height = parseInt(ui.getStyleRule(".filetree .tree-row", "height"), 10);
                 model.rowHeightInner = height;
-                model.rowHeight = height + 1;
+                model.rowHeight = height;
                 model.indent = 12;
                 model.getIconHTML = getIconHTML;
                 
diff --git a/plugins/c9.ide.tree/style.css b/plugins/c9.ide.tree/style.css
index cf7e4a55..7137f666 100644
--- a/plugins/c9.ide.tree/style.css
+++ b/plugins/c9.ide.tree/style.css
@@ -204,7 +204,7 @@
     font-variant: small-caps;
     font-size: 16px;
     margin-top: 0px;
-    margin-bottom: 3px;
+    margin-bottom: 0px;
     color: @tree-heading-color;
     text-shadow: @tree-heading-text-shadow;
     line-height: 0;
diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js
index 2e6fb03d..60a9b861 100644
--- a/plugins/c9.ide.tree/tree.js
+++ b/plugins/c9.ide.tree/tree.js
@@ -212,7 +212,7 @@ define(function(require, exports, module) {
             layout.on("eachTheme", function(e){
                 var height = parseInt(ui.getStyleRule(".filetree .tree-row", "height"), 10) || 22;
                 fsCache.model.rowHeightInner = height;
-                fsCache.model.rowHeight = height + 1;
+                fsCache.model.rowHeight = height;
                 
                 if (e.changed && tree) (tree).resize(true);
             });