Merge branch 'refs/heads/NinjaInternal' into FileIO

2 files changed, 5 insertions, 5 deletions

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 62f7e522..a2283d46 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -90,7 +90,7 @@ exports.CloudPopup = Montage.create(Component, {
         value: function() {
                 if(this._os === 'mac') {
                         location.href = '/ninja_localcloud_for_mac.zip';
-                } else if (this._os === 'win') {
+                } else if (this._os === 'windows') {
                         location.href = '/ninja_localcloud_for_windows.zip';
                 } else {
                         alert('Your operating system is not supported by the Ninja Local Cloud App.');
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index cd19f361..46d74e13 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -198,14 +198,14 @@ exports.StageView = Montage.create(Component, {
     },
     showRulers:{
         value:function(){
-            this.application.ninja.rulerTop.style.display = "block";
-            this.application.ninja.rulerLeft.style.display = "block";
+            this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')";
+            this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')";
         }
     },
     hideRulers:{
         value:function(){
-            this.application.ninja.rulerTop.style.display = "none";
-            this.application.ninja.rulerLeft.style.display = "none";
+            this.application.ninja.rulerTop.style.background = "rgb(128,128,128)";
+            this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)";
         }
     },