aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.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/PropertyTrack.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/PropertyTrack.reel/scss')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 38a16622..2127b92d 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31/* PropertyTrack.scss 31/* PropertyTrack.scss
32 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. 32 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
33 */ 33 */
34 34
35// Import theme settings 35// Import theme settings
36@import "../../../../../scss/imports/themes/default/colors"; 36@import "../../../../../scss/imports/themes/default/colors";
37@import "../../../../../scss/imports/themes/default/mixins"; 37@import "../../../../../scss/imports/themes/default/mixins";
@@ -41,18 +41,18 @@ POSSIBILITY OF SUCH DAMAGE.
41 41
42 42
43.content-main .collapsible-content .timeline-track { 43.content-main .collapsible-content .timeline-track {
44 height: 18px; 44 height: 18px;
45 padding-top: 2px; 45 padding-top: 2px;
46 border-bottom: 1px solid $color-menu-divider; 46 border-bottom: 1px solid $color-menu-divider;
47 background-image: url("../images/gridline.jpg"); 47 background-image: url("../images/gridline.jpg");
48 } 48 }
49 49
50 50
51.timeline-track .content-main { 51.timeline-track .content-main {
52 background-color: $color-menu-bg; 52 background-color: $color-menu-bg;
53} 53}
54 54
55.prop-track .collapsible-content.collapsible-collapsed { 55.prop-track .collapsible-content.collapsible-collapsed {
56 overflow: hidden; 56 overflow: hidden;
57 height: 0px; 57 height: 0px;
58} 58}