aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.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