Merge branch 'refs/heads/master' into components

3 files changed, 43 insertions, 26 deletions

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index e5bad98e..a2283d46 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -88,7 +88,13 @@ exports.CloudPopup = Montage.create(Component, {
     downloadCloudApp: {
         enumerable: false,
         value: function() {
-                console.log(this._os);
+                if(this._os === 'mac') {
+                        location.href = '/ninja_localcloud_for_mac.zip';
+                } 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/io/ui/save-as-dialog.reel/save-as-dialog.css b/js/io/ui/save-as-dialog.reel/save-as-dialog.css
index 40434c25..92970706 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.css
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.css
@@ -10,8 +10,12 @@
     height:150px;
     padding-left: 15px;
     padding-right: 15px;
-    background-color:#313131;
     color: #ffffff;
+    background-color:#494949;
+    font-family: 'Droid Sans', sans-serif;
+    border-radius: 8px;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    text-shadow: 1px 1px 1px #000;
 }
 
 .saveAsDialog .title{
@@ -24,7 +28,7 @@
 }
 
 .saveAsDialog .locationSelection{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
     overflow: auto;
     height:38%;
     padding: 15px;
@@ -65,31 +69,38 @@
     margin-left:3px;
 }
 
+.saveAsDialog .buttons button {
+        float: left;
+        width: 100px;
+        margin-top: 3px;
+}
+
 .saveAsDialog .okButton{
-    margin-right:25px;
-    -webkit-box-align: center;
-    text-align: center;
-    cursor: default;
-    padding: 0px 6px 0px;
-    border:2px solid #d1d1d1;
-    background-color: #e1e1e1;
-    box-sizing: border-box;
-    border-radius:10px;
-    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
-    cursor:pointer;
+    margin: 0px 5px 0px 5px;
+    /*margin-right:25px;*/
+    /*-webkit-box-align: center;*/
+    /*text-align: center;*/
+    /*cursor: default;*/
+    /*padding: 0px 6px 0px;*/
+    /*border:2px solid #d1d1d1;*/
+    /*background-color: #e1e1e1;*/
+    /*box-sizing: border-box;*/
+    /*border-radius:10px;*/
+    /*background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);*/
+    /*cursor:pointer;*/
 }
 
 .saveAsDialog .cancelButton{
-    -webkit-box-align: center;
-    text-align: center;
-    cursor: default;
-    padding: 0px 6px 0px;
-    border:2px solid #d1d1d1;
-    background-color: #e1e1e1;
-    box-sizing: border-box;
-    border-radius:10px;
-    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
-    cursor:pointer;
+    /*-webkit-box-align: center;*/
+    /*text-align: center;*/
+    /*cursor: default;*/
+    /*padding: 0px 6px 0px;*/
+    /*border:2px solid #d1d1d1;*/
+    /*background-color: #e1e1e1;*/
+    /*box-sizing: border-box;*/
+    /*border-radius:10px;*/
+    /*background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);*/
+    /*cursor:pointer;*/
 }
 
 .saveAsDialog input[type="button"]:disabled{
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index f2011a34..4f0d5779 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -48,8 +48,8 @@
     </div>
     <div class="errorMsg"><span id="error" class="error"></span></div>
     <div class="buttons">
-        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
-        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
+        <button id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button>
+        <button id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button>
     </div>
 
 </div>