aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 17:22:01 -0800
committerValerio Virgillito2012-02-09 17:22:01 -0800
commit48977780443d97b9e97b047066639c9056788041 (patch)
tree06b27b22e09f91b320dc63cecf7b5dbef674a2fc /js/panels/CSSPanel
parentb2155233351966ff579db41a7b85be554c643a97 (diff)
parentce963d45cdf2703d2d4eedfa94394b178f86e0f1 (diff)
downloadninja-48977780443d97b9e97b047066639c9056788041.tar.gz
Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into feature-branch
Diffstat (limited to 'js/panels/CSSPanel')
-rw-r--r--js/panels/CSSPanel/CSSPanel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index 94860b30..cf8880a3 100644
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, {
20 init : { 20 init : {
21 enumerable:true, 21 enumerable:true,
22 value : function (){ 22 value : function (){
23 this.minHeight = 300; 23 this.minHeight = 195;
24 this.contentHeight = 300; 24 this.contentHeight = 195;
25 this.defaultHeight= 300; 25 this.defaultHeight= 195;
26 26
27 /* OLD WAY -- Removing the temporary div 27 /* OLD WAY -- Removing the temporary div
28 // TODO: Remove this comment once this is tested. 28 // TODO: Remove this comment once this is tested.