Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolution: Use both.

1 files changed, 10 insertions, 2 deletions

diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index c63e695d..e599668f 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -36,12 +36,20 @@
 }
 
 .toolColorChipCtrl {
-    width: 18px;
+    width: 16px;
+    height: 16px;
+    border: 1px #000 solid;
+}
+
+.toolColorChipContainer
+{
+        background: url(../../../../../images/colorpanel/transparent.png) repeat;
+        width: 18px;
     height: 18px;
     margin-top: 1px;
     margin-left: 3px;    
     margin-right: 8px;    
-    border: 1px black solid;
+    border: 1px #777 solid;
 }
 
 .toolColorChipIcon {