aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-23 13:37:15 -0700
committerJose Antonio Marquez2012-05-23 13:37:15 -0700
commit16decc5726eafbb25675c61be6df85a378ac1fac (patch)
tree5590c4a20a5d9297d3e66a1d290db32f028047eb /js/data
parent27e6e1238ec1adb34aa396074e2559801c7e4314 (diff)
parent108764dbdaa0c040de9146c2d722b6e53830cd54 (diff)
downloadninja-16decc5726eafbb25675c61be6df85a378ac1fac.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/data')
-rw-r--r--js/data/panels-data.js12
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",