aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/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/Span.reel/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/Span.reel/scss')
-rw-r--r--js/panels/Timeline/Span.reel/scss/Span.scss10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss
index 12d72cfa..c166114b 100644
--- a/js/panels/Timeline/Span.reel/scss/Span.scss
+++ b/js/panels/Timeline/Span.reel/scss/Span.scss
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
33/* Span.scss 33/* Span.scss
34 * Main SCSS file for Span component, compiled by SASS into the file css/Span.css. 34 * Main SCSS file for Span component, compiled by SASS into the file css/Span.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";
@@ -48,10 +48,10 @@ POSSIBILITY OF SUCH DAMAGE.
48 height: 16px; 48 height: 16px;
49} 49}
50.tween_span .tween_span_bar { 50.tween_span .tween_span_bar {
51 width: 100%; 51 width: 100%;
52 height: 100%; 52 height: 100%;
53 background-color: #fff; 53 background-color: #fff;
54 opacity: 0.15; 54 opacity: 0.15;
55} 55}
56 56
57.tween_span.spanHighlight .tween_span_bar { 57.tween_span.spanHighlight .tween_span_bar {