Merge branch 'refs/heads/NinjaInternal' into Color

71 files changed, 1396 insertions, 2799 deletions

diff --git a/.gitignore b/.gitignore
index 6c288e8c..40248468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,6 @@ images/treeControl/Thumbs.db
 .DS_Store
 .project
 
-_scss/compass_app_log.txt
-_scss/.sass-cache
-
 js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
 js/panels/Color/colorpanelpopup.reel/compass_app_log.txt
 js/panels/Color/colorpanelbase.reel/compass_app_log.txt
@@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
 cloud/
 
 /.idea/scopes/scope_settings.xml
-_scss/imports/scss/_Stage.scss
 compass_app_log.txt
-js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
\ No newline at end of file
+js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
+scss/.sass-cache/
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..c5ecd429
--- /dev/null
+++ b/README.md
@@ -0,0 +1,52 @@
+## Ninja
+
+...
+--------
+
+###Prerequisites
+
+To run the Ninja Application you will need the following:
+
+-   Be able to access the Motorola internal network, using the blue port or VPN
+-   The latest stable version of Chrome
+-   Ninja can be run in either a Chrome unpackaged application or packaged application (.crx). Instructions below
+
+###Setup and Run Ninja as an unpackaged application
+
+If you're already familiar with using Git, GitHub, and how to configure a local web server,
+
+1.  Download Ninja Local Cloud:
+    Win: get Ninja Local Cloud.exe from \\ninjateam.am.mot.com\users\jmayhew\Ninja Local Cloud,
+    Mac: get Ninja Local Cloud.app from smb://ninjateam.am.mot.com/users/jmayhew/Ninja Local Cloud
+2.  Launch Ninja Local Cloud.  On Mac, click Allow when asked to accept incoming network connection.
+3.  Click Copy button to copy the Ninja Local Cloud URL.
+4.  Launch your cloned master branch.
+5.  You should get the Cloud Service Dialog.
+6.  Paste in the Ninja Local Cloud URL that you copied in step 3.
+7.  Click the TEST button.  It should still show Disconnected.
+8.  In the Ninja Local Cloud app, click on Advanced button, you should see an error that it ignores the url where you run Ninja.  If you don't any text when clicking Test, there's no connection established between Ninja and Ninja Local Cloud, you probably did not click Allow the incoming connection, or check your network connection, try public network instead of DSA, disconnect from VPN, etc.
+9.  Copy the URL in the error text, this is also the URL of where you run your Ninja build, something like http://localhost:9080 on Windows or http://yourmachinename.am.mot.com on Mac
+10. On Windows:
+    Click Start menu icon and type regedit
+    Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options
+    Right click and select New > String value
+    Type 'Local Ninja Origin' no quotes
+    Double click on Local Ninja Origin and paste in the URL copied in step 10 in the Value data field.
+    Close Registry Editor.
+
+11. On Mac:
+    Launch Finder.
+    Double click on <yourusername>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist
+    Click on Add Child
+    Type  'Local Ninja Origin' no quotes
+    For value, paste in the URL copied in step 10.
+    Save (File > Save or Cmd S)
+    Close Property List Editor
+12. Quit Ninja Local Cloud
+13. Launch Ninja Local Cloud
+14. In Ninja, click Test again, you should see the green text that said "Connected to Ninja Local Cloud".
+15. Ninja is opened with no document.  You should be able to do File > New File and select Basic HTML, give it a name and click browse to the directory.  By default, files will be saved in Ninja Projects folder in user documents.  As long as Ninja Local Cloud is running, you will not see the Cloud Service Dialog next time you launch.
+
+
+###Setup and Run Ninja as a packaged application
+
diff --git a/css/ninja.css b/css/ninja.css
index 824a675a..96ae6caf 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #sceneBar { height: 70px; background-color: #474747; }
 
-#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;}
+#mainContainer #rulerTop { background: gray; height: 15px; margin-bottom: 0px; }
 
-#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;}
+#rulerLeft { background: gray; width: 16px; }
 
 #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
 
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index a7d2af10..13a88ba7 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -100,7 +100,8 @@
                     "pressedClass": "active",
                     "preventFocus": true,
                     "identifier": "btnBold",
-                    "label": "B"
+                    "pressedLabel": "B",
+                    "unpressedLabel": "B"
                 },