aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/scss
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/TimelineTrack.reel/scss
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/scss')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss16
1 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 2c090f04..f8b9dcc2 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
33/* TimelineTrack.scss 33/* TimelineTrack.scss
34 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css. 34 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
35 */ 35 */
36 36
37// Import theme settings 37// Import theme settings
38@import "../../../../../scss/imports/themes/default/colors"; 38@import "../../../../../scss/imports/themes/default/colors";
39// @import "../../../../../scss/imports/themes/default/fonts"; 39// @import "../../../../../scss/imports/themes/default/fonts";
@@ -73,21 +73,21 @@ POSSIBILITY OF SUCH DAMAGE.
73 73
74 74
75.tl_layertracks .content-position { 75.tl_layertracks .content-position {
76 height: 63px; 76 height: 63px;
77} 77}
78.tl_layertracks .content-transform { 78.tl_layertracks .content-transform {
79 height: 106px; 79 height: 106px;
80} 80}
81 81
82.tl_layertracks .collapsible-content.collapsible-collapsed { 82.tl_layertracks .collapsible-content.collapsible-collapsed {
83 overflow: hidden; 83 overflow: hidden;
84 height: 0px; 84 height: 0px;
85} 85}
86 86
87.tl_layertracks .collapsible-content .collapsible-label { 87.tl_layertracks .collapsible-content .collapsible-label {
88 height: 21px; 88 height: 21px;
89 background-color: $color-panel-bg; 89 background-color: $color-panel-bg;
90 color: $color-panel-text; 90 color: $color-panel-text;
91 91
92} 92}
93 93