Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

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, {
 //        },
         {
             name: "CSS",
-            minHeight: 195,
-            height: 195,
+            height: 200,
+            minHeight: 200,
             maxHeight: null,
             flexible: true,
-            scrollable: true,
-            collapsed: true,
+            scrollable: false,
+            collapsed: false,
             open: true,
-            modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
-            moduleName: "CSSPanelBase"
+            modulePath: "js/panels/css-panel/css-panel.reel",
+            moduleName: "CssPanel"
         },
         {
             name: "Presets",