aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/css
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-21 14:36:32 -0700
committerArmen Kesablyan2012-06-21 14:36:32 -0700
commitd9f9a65226dfe26500e82061cc38a7dda302f720 (patch)
tree32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/panels/Timeline/TimelineTrack.reel/css
parent1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff)
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
downloadninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/css')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css18
1 files changed, 8 insertions, 10 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
index 57e4dce6..9ea5ce01 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%;
@@ -19,10 +17,10 @@
19 border-bottom-style: solid; 17 border-bottom-style: solid;
20 border-bottom-width: thin; 18 border-bottom-width: thin;
21 background-image: url("../images/gridline.jpg"); 19 background-image: url("../images/gridline.jpg");
22 overflow: hidden; 20 overflow: visible;
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;