diff options
| author | Eric Guzman | 2012-02-13 10:30:26 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 10:30:26 -0800 |
| commit | 672e6f61647b1b8a5f6f5831284fa44bcb7be883 (patch) | |
| tree | 0c15656f1f82f194bfcab68634a88f68fd3d42cb /js/panels/CSSPanel | |
| parent | 586c3f7bbea04e62638e5ed8cdce9933e88c0b67 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-672e6f61647b1b8a5f6f5831284fa44bcb7be883.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPanel
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. |