aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js1
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css2
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css16
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, {
222 } else { 222 } else {
223 console.log("spitting sub keyframes not yet supported"); 223 console.log("spitting sub keyframes not yet supported");
224 } 224 }
225
226 } 225 }
227 }, 226 },
228 227
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 @@
8 */ 8 */
9/* line 19, ../scss/PropertyTrack.scss */ 9/* line 19, ../scss/PropertyTrack.scss */
10.content-main .collapsible-content .timeline-track { 10.content-main .collapsible-content .timeline-track {
11 height: 20px; 11 height: 18px;
12 padding-top: 2px; 12 padding-top: 2px;
13 border-bottom: 1px solid #505050; 13 border-bottom: 1px solid #505050;
14 background-image: url("../images/gridline.jpg"); 14 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 @@
17 17
18 18
19.content-main .collapsible-content .timeline-track { 19.content-main .collapsible-content .timeline-track {
20 height: 20px; 20 height: 18px;
21 padding-top: 2px; 21 padding-top: 2px;
22 border-bottom: 1px solid $color-menu-divider; 22 border-bottom: 1px solid $color-menu-divider;
23 background-image: url("../images/gridline.jpg"); 23 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 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2
3/* <copyright> 2/* <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
7 </copyright> */ 6 </copyright> */
8
9/* TimelineTrack.scss 7/* TimelineTrack.scss
10 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css. 8 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
11 */ 9 */
12/* line 16, ../scss/TimelineTrack.scss */ 10/* line 22, ../scss/TimelineTrack.scss */
13.tracklane { 11.tracklane {
14 height: 19px; 12 height: 19px;
15 width: 100%; 13 width: 100%;
@@ -22,7 +20,7 @@
22 overflow: hidden; 20 overflow: hidden;
23} 21}
24 22
25/* line 28, ../scss/TimelineTrack.scss */ 23/* line 34, ../scss/TimelineTrack.scss */
26.keyframe { 24.keyframe {
27 position: absolute; 25 position: absolute;
28 height: 16px; 26 height: 16px;
@@ -30,7 +28,7 @@
30 background-color: white; 28 background-color: white;
31} 29}
32 30
33/* line 36, ../scss/TimelineTrack.scss */ 31/* line 42, ../scss/TimelineTrack.scss */
34.defaultSpan { 32.defaultSpan {
35 position: absolute; 33 position: absolute;
36 height: 16px; 34 height: 16px;
@@ -38,23 +36,23 @@
38 background-color: white; 36 background-color: white;
39} 37}
40 38
41/* line 45, ../scss/TimelineTrack.scss */ 39/* line 51, ../scss/TimelineTrack.scss */
42.tl_layertracks .content-position { 40.tl_layertracks .content-position {
43 height: 63px; 41 height: 63px;
44} 42}
45 43
46/* line 48, ../scss/TimelineTrack.scss */ 44/* line 54, ../scss/TimelineTrack.scss */
47.tl_layertracks .content-transform { 45.tl_layertracks .content-transform {
48 height: 106px; 46 height: 106px;
49} 47}
50 48
51/* line 52, ../scss/TimelineTrack.scss */ 49/* line 58, ../scss/TimelineTrack.scss */
52.tl_layertracks .collapsible-content.collapsible-collapsed { 50.tl_layertracks .collapsible-content.collapsible-collapsed {
53 overflow: hidden; 51 overflow: hidden;
54 height: 0px; 52 height: 0px;
55} 53}
56 54
57/* line 57, ../scss/TimelineTrack.scss */ 55/* line 63, ../scss/TimelineTrack.scss */
58.tl_layertracks .collapsible-content .collapsible-label { 56.tl_layertracks .collapsible-content .collapsible-label {
59 height: 21px; 57 height: 21px;
60 background-color: #474747; 58 background-color: #474747;