Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 30bf43fe..3ea943d8 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -73,4 +73,11 @@ div.content-style input.nj-skinned {
         font-size: 12px;
         top: -3px;
 }
+div.style-row .container-propvals {
+        overflow: hidden;
+}
+
+.content-style .style-row.style-selected {
+        //background-color: red !important;
+}