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>
---
 .../PropertyTrack.reel/scss/PropertyTrack.scss      | 21 +++++++++++++++++++++
 .../Timeline/PropertyTrack.reel/scss/config.rb      |  9 +++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
 create mode 100644 js/panels/Timeline/PropertyTrack.reel/scss/config.rb

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

diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
new file mode 100644
index 00000000..ef8e1ec2
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -0,0 +1,21 @@
+/* PropertyTrack.scss
+ * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
+ */
+ 
+// Import theme settings
+@import "../../../../../scss/imports/themes/default/colors";
+@import "../../../../../scss/imports/themes/default/mixins";
+
+// Import generic mixins and styles
+@import "../../../../../scss/imports/scss/mixins";
+
+
+.content-main .collapsible-content .timeline-track {
+ 	height: 20px;
+	border-bottom: 1px solid $color-menu-divider;
+ }
+
+
+.timeline-track .content-main {
+	background-color: $color-menu-bg;
+}
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/config.rb b/js/panels/Timeline/PropertyTrack.reel/scss/config.rb
new file mode 100644
index 00000000..e5a99b70
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/config.rb
@@ -0,0 +1,9 @@
+# Require any additional compass plugins here.
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "../css"
+sass_dir = ""
+images_dir = "../images/"
+javascripts_dir = "../js"
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
-- 
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/PropertyTrack.reel/scss/PropertyTrack.scss | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index ef8e1ec2..273e3d77 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -1,3 +1,9 @@
+/* <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> */
+
 /* PropertyTrack.scss
  * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
  */
-- 
cgit v1.2.3


From f14bc1ace048e46cbcb7148dbe37a5d2065a3779 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 24 Feb 2012 17:26:08 -0800
Subject: Timeline: Add grids to property tracks. First take on clearTimeline
 method on TimelinePanel class.

---
 js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 273e3d77..c7ae6f0c 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -19,6 +19,7 @@
 .content-main .collapsible-content .timeline-track {
  	height: 20px;
 	border-bottom: 1px solid $color-menu-divider;
+    background-image: url("../images/gridline.jpg");
  }
 
 
-- 
cgit v1.2.3