From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 07:37:17 -0800
Subject: Timeline Reset to clean Master branch.  Code scrub.

Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../TimelineTrack.reel/scss/TimelineTrack.scss         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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

diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index c492d18d..01dd948c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -5,13 +5,13 @@
  */
  
 // Import theme settings
-@import "../../../../../_scss/imports/themes/default/colors";
-// @import "../../../../../_scss/imports/themes/default/fonts";
-@import "../../../../../_scss/imports/themes/default/mixins";
+@import "../../../../../scss/imports/themes/default/colors";
+// @import "../../../../../scss/imports/themes/default/fonts";
+@import "../../../../../scss/imports/themes/default/mixins";
 
 // Import generic mixins and styles
-@import "../../../../../_scss/imports/scss/mixins";
-// @import "../../../../../_scss/imports/scss/Base";
+@import "../../../../../scss/imports/scss/mixins";
+// @import "../../../../../scss/imports/scss/Base";
 
 .tracklane{
     height: 19px;
@@ -61,5 +61,11 @@
 
 }
  .tl_layertracks .collapsible-content .timeline-track {
- 	height: 21px;
+ 	height: 20px;
+	border-bottom: 1px solid $color-menu-divider;
  }
+
+
+.timeline-track .content-main {
+	background-color: $color-menu-bg;
+}
-- 
cgit v1.2.3


From cf671b4855ecca0278128e82459691292a3d3dc9 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 08:08:30 -0800
Subject: Timeline: Create new PropertyTrack subcomponent, and use it in the
 TimelineTrack component.

Cherry pick commit from jreid/Timeline-jreid

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 01dd948c..43d5f438 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -60,12 +60,4 @@
 	color: $color-panel-text;
 
 }
- .tl_layertracks .collapsible-content .timeline-track {
- 	height: 20px;
-	border-bottom: 1px solid $color-menu-divider;
- }
 
-
-.timeline-track .content-main {
-	background-color: $color-menu-bg;
-}
-- 
cgit v1.2.3


From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 10:20:04 -0800
Subject: Adding some missing copyrights

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 43d5f438..1b025c74 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -1,5 +1,11 @@
 @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.
  */
-- 
cgit v1.2.3