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>

1 files changed, 51 insertions, 0 deletions

diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.css b/node_modules/montage/ui/bluemoon/progress.reel/progress.css
new file mode 100644
index 00000000..cf9e6543
--- /dev/null
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.css
@@ -0,0 +1,51 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+.montage-progress {
+        height: 7px;
+        padding: 1px;
+        border-radius: 5px / 4px;
+        overflow: hidden;
+        background: #ccc url(rule.png);
+        -webkit-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
+}
+
+.montage-progress .bar {
+        height: 7px;
+        border-radius: inherit;
+
+        background-repeat: no-repeat;
+        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%,
+                                                color-stop(12%, #35c9ff), color-stop(12%, #0cbeff),
+                                                color-stop(85%, #0aa5dd), color-stop(85%, #0996c9) );
+
+        -webkit-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
+}
+
+.montage-progress.dark {
+        background:  url(rule.png), -webkit-gradient(linear, 0% 0%, 0% 100%,
+                                                color-stop(0%, #303030), color-stop(100%, #3f3f3f) );
+
+        -webkit-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
+}
+
+@-webkit-keyframes montage-progress-scroll {
+    from {
+        background-position: 0px top;
+    }
+    to {
+        background-position: -8px top;
+    }
+}
+
+.montage-progress .bar.scrolling {
+    background-image: url("scroll.png");
+    background-repeat: repeat-x;
+    background-position: 10px top;
+    -webkit-animation-name: montage-progress-scroll;
+    -webkit-animation-duration: 1s;
+    -webkit-animation-timing-function: linear;
+    -webkit-animation-iteration-count: infinite;
+}