diff options
author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/data/panels-data.js | |
parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/data/panels-data.js')
-rw-r--r-- | js/data/panels-data.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index f613a3be..ffc76782 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -72,15 +72,15 @@ exports.PanelsData = Montage.create(Montage, { | |||
72 | // }, | 72 | // }, |
73 | { | 73 | { |
74 | name: "CSS", | 74 | name: "CSS", |
75 | minHeight: 195, | 75 | height: 200, |
76 | height: 195, | 76 | minHeight: 200, |
77 | maxHeight: null, | 77 | maxHeight: null, |
78 | flexible: true, | 78 | flexible: true, |
79 | scrollable: true, | 79 | scrollable: false, |
80 | collapsed: true, | 80 | collapsed: false, |
81 | open: true, | 81 | open: true, |
82 | modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", | 82 | modulePath: "js/panels/css-panel/css-panel.reel", |
83 | moduleName: "CSSPanelBase" | 83 | moduleName: "CssPanel" |
84 | }, | 84 | }, |
85 | { | 85 | { |
86 | name: "Presets", | 86 | name: "Presets", |