From 48a0d3a091602d4d04b0b529b780261f0d2ebc1d Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 10 May 2012 10:44:18 -0700
Subject: Timeline: Bug fix: tweens now hide when their container collapses.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/scss/Layer.scss | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 8e5e50db..a407c9dc 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -196,6 +196,9 @@
 	top: 3px;
 	right: 31px;
 }
+.timeline-track .collapsible-content {
+	position: relative;
+}
 .collapsible-content .layout-table {
 	width: 99.9%;
 }
-- 
cgit v1.2.3


From 26f1524c049791cb9cd81695c57b84d952a2e7e6 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 15 May 2012 16:08:26 -0700
Subject: Timeline: Multiselect from the layer panel.

---
 js/panels/Timeline/Layer.reel/scss/Layer.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index a407c9dc..8f8881dd 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -74,7 +74,8 @@
 
 /******************************************/
 
-.container-layer {
+.container-layer,
+.container-layer.selected {
 	background-color: $color-panel-bg;
 	color: $color-panel-text;
 	font-size: 12px;
@@ -108,7 +109,7 @@
 
 
 .layerSelected .label-layer {
-	background-color: $color-panel-hilite-bg;
+	background-color: $color-menu-hilite-bg;
 	color: $color-panel-hilite-text;
 }
 .content-layer {
-- 
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/Layer.reel/scss/Layer.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 8f8881dd..5220d0f1 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -274,10 +274,10 @@
 .content-style .item-template {
 	display: none;
 }
+.style-row {
+	height: 20px;
+}
 .content-style .layout-row.selected .layout-cell {
 	background-color: $color-panel-hilite-bg;
 	color: $color-panel-hilite-text;
 }
-.style-row {
-	height: 20px;
-}
-- 
cgit v1.2.3