diff options
| author | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
| commit | c6ed3331e88eb01a52ac533e5449df3af2fb5965 (patch) | |
| tree | 2b660dc94a98bad02b46ba44a28424d692435fb3 /js/panels/CSSPanel | |
| parent | 5d38e575b2bafeae9bd676247fce15ec5f78fa32 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-c6ed3331e88eb01a52ac533e5449df3af2fb5965.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
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. |