From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/panels/CSSPanel/CSSPanel.js                                            | 0
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css                     | 0
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html                    | 0
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js                      | 0
 js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html  | 0
 js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js    | 0
 .../CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css      | 0
 js/panels/CSSPanel/css-property-name-list.js                              | 0
 js/panels/CSSPanel/css-shorthand-map.js                                   | 0
 js/panels/CSSPanel/css-value-completion-map.js                            | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/panels/CSSPanel/CSSPanel.js
 mode change 100644 => 100755 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
 mode change 100644 => 100755 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
 mode change 100644 => 100755 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
 mode change 100644 => 100755 js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
 mode change 100644 => 100755 js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
 mode change 100644 => 100755 js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css
 mode change 100644 => 100755 js/panels/CSSPanel/css-property-name-list.js
 mode change 100644 => 100755 js/panels/CSSPanel/css-shorthand-map.js
 mode change 100644 => 100755 js/panels/CSSPanel/css-value-completion-map.js

(limited to 'js/panels/CSSPanel')

diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/css-property-name-list.js b/js/panels/CSSPanel/css-property-name-list.js
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
old mode 100644
new mode 100755
diff --git a/js/panels/CSSPanel/css-value-completion-map.js b/js/panels/CSSPanel/css-value-completion-map.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 2082fa6912eec2ffabd2081b7706e8e1b88a9711 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 2 Feb 2012 19:03:59 -0800
Subject: Initial Text Tool Implementation

Has rich-text-editor in place need to place with finalized version when complete
---
 js/panels/CSSPanel/CSSPanel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/panels/CSSPanel')

diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index 94860b30..cf8880a3 100644
--- 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.
-- 
cgit v1.2.3


From 2e5aa1f10fc2dfd550d9144dc07023336fc7f41e Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Thu, 16 Feb 2012 00:07:38 -0800
Subject: CSS Panel - Add Resizer to sub panels

---
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css  |  6 +++++-
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'js/panels/CSSPanel')

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 {
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 5d6273b6..5b50fbf1 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>
-- 
cgit v1.2.3


From 220793c44a9ec4f20ab4c194ffa15587f95845e3 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Thu, 16 Feb 2012 11:35:00 -0800
Subject: CSSPanel - fix code indentation

---
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'js/panels/CSSPanel')

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 5b50fbf1..db630934 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -11,13 +11,13 @@
         <script type="text/montage-serialization">
         {
             "resizer1": {
-            "module": "js/panels/Resizer",
-            "name": "Resizer",
-            "properties": {
-                "element": {"#": "subPanelResizer"},
-                "panel": {"#": "nj-section-stylesheets"},
-                "isVertical": true
-            }
+                "module": "js/panels/Resizer",
+                "name": "Resizer",
+                "properties": {
+                    "element": {"#": "subPanelResizer"},
+                    "panel": {"#": "nj-section-stylesheets"},
+                    "isVertical": true
+                }
             },
 
             "ComputedStyleSubPanel1": {
-- 
cgit v1.2.3