aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/scss
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/Timeline/TimelineTrack.reel/scss
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/scss')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss39
1 files changed, 20 insertions, 19 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 2c090f04..f092adc5 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -1,26 +1,27 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3/* <copyright> 3/* <copyright>
4Copyright (c) 2012, Motorola Mobility, Inc 4Copyright (c) 2012, Motorola Mobility LLC.
5All Rights Reserved. 5All Rights Reserved.
6BSD License.
7 6
8Redistribution and use in source and binary forms, with or without 7Redistribution and use in source and binary forms, with or without
9modification, are permitted provided that the following conditions are met: 8modification, are permitted provided that the following conditions are met:
10 9
11 - Redistributions of source code must retain the above copyright notice, 10* Redistributions of source code must retain the above copyright notice,
12 this list of conditions and the following disclaimer. 11 this list of conditions and the following disclaimer.
13 - Redistributions in binary form must reproduce the above copyright 12
14 notice, this list of conditions and the following disclaimer in the 13* Redistributions in binary form must reproduce the above copyright notice,
15 documentation and/or other materials provided with the distribution. 14 this list of conditions and the following disclaimer in the documentation
16 - Neither the name of Motorola Mobility nor the names of its contributors 15 and/or other materials provided with the distribution.
17 may be used to endorse or promote products derived from this software 16
18 without specific prior written permission. 17* Neither the name of Motorola Mobility LLC nor the names of its
18 contributors may be used to endorse or promote products derived from this
19 software without specific prior written permission.
19 20
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 21THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 22AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 23IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 24ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -33,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
33/* TimelineTrack.scss 34/* TimelineTrack.scss
34 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css. 35 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
35 */ 36 */
36 37
37// Import theme settings 38// Import theme settings
38@import "../../../../../scss/imports/themes/default/colors"; 39@import "../../../../../scss/imports/themes/default/colors";
39// @import "../../../../../scss/imports/themes/default/fonts"; 40// @import "../../../../../scss/imports/themes/default/fonts";
@@ -73,21 +74,21 @@ POSSIBILITY OF SUCH DAMAGE.
73 74
74 75
75.tl_layertracks .content-position { 76.tl_layertracks .content-position {
76 height: 63px; 77 height: 63px;
77} 78}
78.tl_layertracks .content-transform { 79.tl_layertracks .content-transform {
79 height: 106px; 80 height: 106px;
80} 81}
81 82
82.tl_layertracks .collapsible-content.collapsible-collapsed { 83.tl_layertracks .collapsible-content.collapsible-collapsed {
83 overflow: hidden; 84 overflow: hidden;
84 height: 0px; 85 height: 0px;
85} 86}
86 87
87.tl_layertracks .collapsible-content .collapsible-label { 88.tl_layertracks .collapsible-content .collapsible-label {
88 height: 21px; 89 height: 21px;
89 background-color: $color-panel-bg; 90 background-color: $color-panel-bg;
90 color: $color-panel-text; 91 color: $color-panel-text;
91 92
92} 93}
93 94