From 7fc06fc76fe712185b3bd2bccd7a67d972311918 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Sat, 29 Aug 2015 13:12:27 -0700
Subject: [PATCH] some more dark theme tweaks

# Conflicts:
#	plugins/c9.ide.layout.classic/themes/default-dark.less
#	plugins/c9.ide.layout.classic/themes/default-flat-light.less
---
 package.json                                                | 2 +-
 plugins/c9.ide.layout.classic/themes/default-dark.less      | 6 ++++--
 .../c9.ide.layout.classic/themes/default-flat-light.less    | 6 +++---
 plugins/c9.ide.layout.classic/themes/flat-light.less        | 3 +++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 0a512fd9..7c8c5d56 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#4de6a0b9a4",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#326087f5a2",
-        "c9.ide.scm": "#57a1e80116",
+        "c9.ide.scm": "#8a439109c7",
         "c9.ide.terminal.monitor": "#b52a3f2144",
         "c9.ide.theme.flat": "#2de8414db7",
         "c9.ide.threewaymerge": "#229382aa0b",
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less
index f6858084..f1b3053b 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark.less
@@ -1689,11 +1689,13 @@
 @coverage-button-font-size: 14px;
 
 @detail-label-color: #f1f1f1;
-@detail-label-background: #333333;
+@detail-label-background: #272727;
 @detail-label-margin: 2px 0 0 67px;
 @detail-label-border-bottom: 1px solid rgba(0,0,0,0.7);
 @detail-label-box-shadow: rgba(255, 255, 255, 0.06);
 
 @detail-label-hash-border: 1px solid @highlight-color;
-@detail-label-hash-color: #ddd;
+@detail-label-hash-color: @highlight-color;
 @detail-label-hash-background: #555555;
+
+@panel-settings-changes-top: 36px;
\ No newline at end of file
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
index 026c4da3..c4083c2c 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -1685,9 +1685,8 @@
 @stats-menu-info-border: 0;
 @stats-menu-info-box-shadow: none;
 
-<<<<<<< HEAD
 @coverage-button-font-size: 25px;
-=======
+
 @detail-label-color: #333333;
 @detail-label-background: #F6F6F6;
 @detail-label-margin: 1px 0 0 67px;
@@ -1697,4 +1696,5 @@
 @detail-label-hash-border: 1px solid #DDDE33;
 @detail-label-hash-color: #333;
 @detail-label-hash-background: #f9f796;
->>>>>>> 73f71b5... first fixes for dark theme
+
+@panel-settings-changes-top: 46px;
\ No newline at end of file
diff --git a/plugins/c9.ide.layout.classic/themes/flat-light.less b/plugins/c9.ide.layout.classic/themes/flat-light.less
index 61b0dd01..e5308d0f 100644
--- a/plugins/c9.ide.layout.classic/themes/flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/flat-light.less
@@ -410,6 +410,9 @@
 .installer .execute .progress{
     bottom: -44px;
 }
+.top-test-panel{
+    border-bottom: 1px solid @border-highlight;
+}
 
 .has_apf .toolbar-top .sbtb_middle{
     height: auto;