aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/CSSPanel.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 10:29:49 -0800
committerEric Guzman2012-02-13 10:29:49 -0800
commite4893f7d3c3b9bd7967973197c3ffb5d3a075c91 (patch)
treef3d4fd9d96ba0dcf846fbf66153fb443bd60f767 /js/panels/CSSPanel/CSSPanel.js
parentef032412216d437ce1c7dfc9050ab41adf0594c0 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-e4893f7d3c3b9bd7967973197c3ffb5d3a075c91.tar.gz
Merge branch 'refs/heads/master' into TreeComponents
Diffstat (limited to 'js/panels/CSSPanel/CSSPanel.js')
-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.