Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.css b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
index 6d804e50..fcf85e75 100644
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.css
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
@@ -43,7 +43,7 @@
 .cloud_popup .content .btn_test {
   float: right;
   clear: right;
-  margin: 0px 0px 0px 8px;
+  margin: 1px 2px 0px 8px;
   width: 60px;
 }
 
@@ -94,5 +94,5 @@
   width: 80px;
   text-align: center;
   float: right;
-  margin: 8px 0px 0px 8px;
+  margin: 8px 2px 2px 8px;
 }
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
index 5137beff..b8c9f880 100755
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
@@ -47,7 +47,7 @@ $grey_light: #494949;
 {
         float: right;
         clear: right;
-        margin: 0px 0px 0px 8px;
+        margin: 1px 2px 0px 8px;
         width: 60px;
 }
 
@@ -98,5 +98,5 @@ $grey_light: #494949;
         width: 80px;
         text-align: center;
         float: right;
-        margin: 8px 0px 0px 8px;
+        margin: 8px 2px 2px 8px;
 }
\ No newline at end of file