Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/hintable.reel/hintable.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
index cb119a14..5d71e2e7 100644
--- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -8,12 +8,19 @@
  */
 /* line 19, ../scss/PropertyTrack.scss */
 .content-main .collapsible-content .timeline-track {
-  height: 20px;
+  height: 18px;
+  padding-top: 2px;
   border-bottom: 1px solid #505050;
   background-image: url("../images/gridline.jpg");
 }
 
-/* line 26, ../scss/PropertyTrack.scss */
+/* line 27, ../scss/PropertyTrack.scss */
 .timeline-track .content-main {
   background-color: #474747;
 }
+
+/* line 31, ../scss/PropertyTrack.scss */
+.prop-track .collapsible-content.collapsible-collapsed {
+  overflow: hidden;
+  height: 0px;
+}