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, 11 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..c5287b00 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -73,4 +73,15 @@ div.content-style input.nj-skinned {
         font-size: 12px;
         top: -3px;
 }
+div.style-row .container-propvals {
+        overflow: hidden;
+}
 
+.content-style .style-row.selected {
+  background-color: $color-panel-bg;
+  color: $color-panel-text;
+}
+.content-style .style-row.style-selected {
+  background-color: $color-panel-hilite-bg;
+  color: $color-panel-hilite-text;
+}