Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 8 insertions, 25 deletions

diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.css b/node_modules/montage/ui/bluemoon/progress.reel/progress.css
index cf9e6543..3887fab3 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.css
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.css
@@ -10,18 +10,18 @@
         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;
+        -moz-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;
+        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) );
+        background: #0cbeff;
 
         -webkit-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
+        -moz-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
+        transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
 }
 
 .montage-progress.dark {
@@ -29,23 +29,6 @@
                                                 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;
-}
+        -moz-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
+        box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
+}
\ No newline at end of file