Merge branch 'refs/heads/master' into new-tool-icons

10 files changed, 19 insertions, 4 deletions

diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index 94860b30..cf8880a3 100644..100755
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, {
     init : {
         enumerable:true,
         value : function (){
-            this.minHeight = 300;
-            this.contentHeight = 300;
-            this.defaultHeight= 300;
+            this.minHeight = 195;
+            this.contentHeight = 195;
+            this.defaultHeight= 195;
 
             /* OLD WAY -- Removing the temporary div
             // TODO: Remove this comment once this is tested.
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index 27d19e58..1b3c9184 100644..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 {
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 5d6273b6..db630934 100644..100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -10,6 +10,16 @@
                 <link rel="stylesheet" href="CSSPanelBase.css" type="text/css">
         <script type="text/montage-serialization">
         {
+            "resizer1": {
+                "module": "js/panels/Resizer",
+                "name": "Resizer",
+                "properties": {
+                    "element": {"#": "subPanelResizer"},
+                    "panel": {"#": "nj-section-stylesheets"},
+                    "isVertical": true
+                }
+            },
+
             "ComputedStyleSubPanel1": {
                 "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
                 "name": "ComputedStyleSubPanel",
@@ -43,6 +53,7 @@
                 <div  id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
                         <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a>
                 </div>
+        <div id="subPanelResizer" class="resizer"></div>
                 <!-- Style Rule list subsection -->
                 <h2 id="nj-css-styles-header" class="nj-section-header">
                         <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div>
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index 0c950ffd..0c950ffd 100644..100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
index c30d2fb4..c30d2fb4 100644..100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
index bb6f9de6..bb6f9de6 100644..100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css
index e9af9b88..e9af9b88 100644..100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css
diff --git a/js/panels/CSSPanel/css-property-name-list.js b/js/panels/CSSPanel/css-property-name-list.js
index 24a69c09..24a69c09 100644..100755
--- a/js/panels/CSSPanel/css-property-name-list.js
+++ b/js/panels/CSSPanel/css-property-name-list.js
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index bc43ebc4..bc43ebc4 100644..100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
diff --git a/js/panels/CSSPanel/css-value-completion-map.js b/js/panels/CSSPanel/css-value-completion-map.js
index 773fde96..773fde96 100644..100755
--- a/js/panels/CSSPanel/css-value-completion-map.js
+++ b/js/panels/CSSPanel/css-value-completion-map.js