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, 8 insertions, 10 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
index 57e4dce6..9ea5ce01 100644
--- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
+++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -1,15 +1,13 @@
 @charset "UTF-8";
-
 /* <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
-
 /* TimelineTrack.scss
  * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
  */
-/* line 16, ../scss/TimelineTrack.scss */
+/* line 22, ../scss/TimelineTrack.scss */
 .tracklane {
   height: 19px;
   width: 100%;
@@ -19,10 +17,10 @@
   border-bottom-style: solid;
   border-bottom-width: thin;
   background-image: url("../images/gridline.jpg");
-  overflow: hidden;
+  overflow: visible;
 }
 
-/* line 28, ../scss/TimelineTrack.scss */
+/* line 34, ../scss/TimelineTrack.scss */
 .keyframe {
   position: absolute;
   height: 16px;
@@ -30,7 +28,7 @@
   background-color: white;
 }
 
-/* line 36, ../scss/TimelineTrack.scss */
+/* line 42, ../scss/TimelineTrack.scss */
 .defaultSpan {
   position: absolute;
   height: 16px;
@@ -38,23 +36,23 @@
   background-color: white;
 }
 
-/* line 45, ../scss/TimelineTrack.scss */
+/* line 51, ../scss/TimelineTrack.scss */
 .tl_layertracks .content-position {
   height: 63px;
 }
 
-/* line 48, ../scss/TimelineTrack.scss */
+/* line 54, ../scss/TimelineTrack.scss */
 .tl_layertracks .content-transform {
   height: 106px;
 }
 
-/* line 52, ../scss/TimelineTrack.scss */
+/* line 58, ../scss/TimelineTrack.scss */
 .tl_layertracks .collapsible-content.collapsible-collapsed {
   overflow: hidden;
   height: 0px;
 }
 
-/* line 57, ../scss/TimelineTrack.scss */
+/* line 63, ../scss/TimelineTrack.scss */
 .tl_layertracks .collapsible-content .collapsible-label {
   height: 21px;
   background-color: #474747;