Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index 27d19e58..1b3c9184 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -10,6 +10,11 @@
         -webkit-box-orient: vertical;
     height:100%;
 }
+.css_panel .resizer {
+    background-color: #333;
+    cursor: row-resize;
+    height: 1px;
+}
 .nj-section-header {
         background-color: #333;
         border-top: 1px solid #3D3D3D;
@@ -37,7 +42,6 @@
     -webkit-box-flex: 0;
     background-color: #474747;
     color: #FFF;
-    max-height: 68px;
     overflow-y: scroll;
 }
 #nj-section-styles {