From 9bc43e9f815dc8c2eda3a3d3413f950481c5f86d Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 16 May 2012 08:01:39 -0700
Subject: CSS pixel fix for prop tracks

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js   |  1 -
 .../Timeline/PropertyTrack.reel/css/PropertyTrack.css    |  2 +-
 .../Timeline/PropertyTrack.reel/scss/PropertyTrack.scss  |  2 +-
 .../Timeline/TimelineTrack.reel/css/TimelineTrack.css    | 16 +++++++---------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index f2004b94..8fe87500 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -222,7 +222,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             } else {
                 console.log("spitting sub keyframes not yet supported");
             }
-
         }
     },
 
diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
index ddcc536e..5d71e2e7 100644
--- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -8,7 +8,7 @@
  */
 /* line 19, ../scss/PropertyTrack.scss */
 .content-main .collapsible-content .timeline-track {
-  height: 20px;
+  height: 18px;
   padding-top: 2px;
   border-bottom: 1px solid #505050;
   background-image: url("../images/gridline.jpg");
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 31aed851..a560ff3c 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -17,7 +17,7 @@
 
 
 .content-main .collapsible-content .timeline-track {
- 	height: 20px;
+ 	height: 18px;
     padding-top: 2px;
 	border-bottom: 1px solid $color-menu-divider;
     background-image: url("../images/gridline.jpg");
diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
index 57e4dce6..03d1cf8d 100644
--- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
+++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -1,15 +1,13 @@
 @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.
  */
-/* line 16, ../scss/TimelineTrack.scss */
+/* line 22, ../scss/TimelineTrack.scss */
 .tracklane {
   height: 19px;
   width: 100%;
@@ -22,7 +20,7 @@
   overflow: hidden;
 }
 
-/* line 28, ../scss/TimelineTrack.scss */
+/* line 34, ../scss/TimelineTrack.scss */
 .keyframe {
   position: absolute;
   height: 16px;
@@ -30,7 +28,7 @@
   background-color: white;
 }
 
-/* line 36, ../scss/TimelineTrack.scss */
+/* line 42, ../scss/TimelineTrack.scss */
 .defaultSpan {
   position: absolute;
   height: 16px;
@@ -38,23 +36,23 @@
   background-color: white;
 }
 
-/* line 45, ../scss/TimelineTrack.scss */
+/* line 51, ../scss/TimelineTrack.scss */
 .tl_layertracks .content-position {
   height: 63px;
 }
 
-/* line 48, ../scss/TimelineTrack.scss */
+/* line 54, ../scss/TimelineTrack.scss */
 .tl_layertracks .content-transform {
   height: 106px;
 }
 
-/* line 52, ../scss/TimelineTrack.scss */
+/* line 58, ../scss/TimelineTrack.scss */
 .tl_layertracks .collapsible-content.collapsible-collapsed {
   overflow: hidden;
   height: 0px;
 }
 
-/* line 57, ../scss/TimelineTrack.scss */
+/* line 63, ../scss/TimelineTrack.scss */
 .tl_layertracks .collapsible-content .collapsible-label {
   height: 21px;
   background-color: #474747;
-- 
cgit v1.2.3