diff options
| author | Valerio Virgillito | 2012-02-12 21:50:49 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-12 21:50:49 -0800 |
| commit | dcd147265ad0339448ea4466253b03b2899e0cea (patch) | |
| tree | a2afd9a3f4b4545141b21a31002d81bb5f79f44b /js/panels/CSSPanel/CSSPanel.js | |
| parent | a30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-dcd147265ad0339448ea4466253b03b2899e0cea.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into stage-color
Diffstat (limited to 'js/panels/CSSPanel/CSSPanel.js')
| -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. |