aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 10:46:45 -0700
committerNivesh Rajbhandari2012-04-05 10:46:45 -0700
commit0221288738afd5310ab7659fb951c1d7fb9b93b8 (patch)
treecbe1f13098c0d0e1b6e703ea63b0296ac9c2d62d
parent55f4835aa33546f5cd27e501ed461a0f7eb5038b (diff)
downloadninja-0221288738afd5310ab7659fb951c1d7fb9b93b8.tar.gz
Undoing some minor spacing differences from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css2
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index ca6fe6fd..067285ae 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -15,7 +15,7 @@
15 -webkit-box-orient: horizontal; 15 -webkit-box-orient: horizontal;
16 height : 100%; 16 height : 100%;
17 position: relative; 17 position: relative;
18 margin-top: 1px; 18 margin-top:1px;
19} 19}
20.leftinside{ 20.leftinside{
21 height: 100%; 21 height: 100%;
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js
index 24fab684..4ca2a662 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.js
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -23,6 +23,6 @@ exports.TransitionsLibrary = Montage.create(Component, {
23 handleNodeActivation: { 23 handleNodeActivation: {
24 value: function(presetData) { 24 value: function(presetData) {
25 this.application.ninja.presetsController.applyPreset(presetData); 25 this.application.ninja.presetsController.applyPreset(presetData);
26 } 26 }
27 } 27 }
28}); 28});