diff options
| author | Nivesh Rajbhandari | 2012-02-10 15:14:35 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-10 15:14:35 -0800 |
| commit | de65f73c0f129a26aa9007b69e8fce31d0e92d00 (patch) | |
| tree | e0fd4bbc44b96909d7619593b29d9b063209a7ce /js/panels/CSSPanel | |
| parent | 9e40945a5bf4330d1088b56b8011ee625b1adab9 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-de65f73c0f129a26aa9007b69e8fce31d0e92d00.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/CSSPanel')
| -rw-r--r-- | js/panels/CSSPanel/CSSPanel.js | 6 |
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. |