From fadf2a5f05c9b3e19caa2f18fc6d4d0e1e4fb02f Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 24 May 2012 16:06:02 -0700
Subject: Timeline: Bug fix IKNINJA 1566: Adding a css style property makes the
 blow layer name disappear.

---
 js/panels/Timeline/Style.reel/scss/Style.scss | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'js/panels/Timeline/Style.reel/scss')

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 30bf43fe..66028cbe 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -73,4 +73,7 @@ div.content-style input.nj-skinned {
 	font-size: 12px;
 	top: -3px;
 }
+div.style-row .container-propvals {
+	overflow: hidden;
+}
 
-- 
cgit v1.2.3


From 4a8a293ba3fdf934a431152a9351f45092fb3695 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 25 May 2012 14:01:45 -0700
Subject: Timeline: bug fix: better selection/deselection of styles within
 layers.

---
 js/panels/Timeline/Style.reel/scss/Style.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/panels/Timeline/Style.reel/scss')

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 66028cbe..3ea943d8 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -77,3 +77,7 @@ div.style-row .container-propvals {
 	overflow: hidden;
 }
 
+.content-style .style-row.style-selected {
+	//background-color: red !important;
+}
+
-- 
cgit v1.2.3


From 4338d57eed565f723bfb7cbcefca65836b68953b Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 1 Jun 2012 14:26:30 -0700
Subject: Timeline: Better style selection and deselection. Automatic
 re-selection of previously selected style when parent layer is reselected.

---
 js/panels/Timeline/Style.reel/scss/Style.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'js/panels/Timeline/Style.reel/scss')

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 3ea943d8..c5287b00 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -77,7 +77,11 @@ 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: red !important;
+  background-color: $color-panel-hilite-bg;
+  color: $color-panel-hilite-text;
 }
-
-- 
cgit v1.2.3