diff options
| author | Armen Kesablyan | 2012-02-13 13:36:52 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 13:36:52 -0800 |
| commit | da32190d5dd91fa2c26f8cabb746980c3d06035c (patch) | |
| tree | d923299208c84b1071b58e7eb9c0515b2e1c844a /js/panels/CSSPanel | |
| parent | 36cefa3526988cb4dfea107fedaa954a2703260d (diff) | |
| parent | 90d0c8c0e98d062c628c061fe5765ce991fda409 (diff) | |
| download | ninja-da32190d5dd91fa2c26f8cabb746980c3d06035c.tar.gz | |
Merge branch 'refs/heads/master' into text-tool
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 cf8880a3..94860b30 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 = 195; | 23 | this.minHeight = 300; |
| 24 | this.contentHeight = 195; | 24 | this.contentHeight = 300; |
| 25 | this.defaultHeight= 195; | 25 | this.defaultHeight= 300; |
| 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. |