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, 67 insertions, 0 deletions

diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.css b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.css
new file mode 100644
index 00000000..637d9cde
--- /dev/null
+++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.css
@@ -0,0 +1,67 @@
+/* <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-scroll-bars {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 9999;
+    pointer-events: none;
+}
+.montage-scroll-bars .top {
+    position: absolute;
+    right: 2px;
+    background: black;
+    -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27);
+    width: 5px;
+    height: 3px;
+    border-radius: 4px 4px 0 0;
+    opacity: 0;
+    clip: rect(-1px, 6px, 3px, -1px);
+    -webkit-transform: translateZ(0);
+}
+.montage-scroll-bars .bottom {
+    background: black;
+    -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27);
+    width: 5px;
+    border-radius: 0 0 4px 4px;
+    opacity: 0;
+    -webkit-transform: translateZ(0);
+}
+.montage-scroll-bars .bottom-clip {
+    position: absolute;
+    right: 2px;
+    width: 5px;
+    -webkit-transform: translateZ(0);
+}
+.montage-scroll-bars .left {
+    position: absolute;
+    bottom: 2px;
+    background: black;
+    -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27);
+    width: 3px;
+    height: 5px;
+    border-radius: 4px 0 0 4px;
+    opacity: 0;
+    clip: rect(-1px, 3px, 6px, -1px);
+    -webkit-transform: translateZ(0);
+}
+.montage-scroll-bars .right {
+    background: black;
+    -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27);
+    height: 5px;
+    border-radius: 0 4px 4px 0;
+    opacity: 0;
+    -webkit-transform: translateZ(0);
+}
+.montage-scroll-bars .right-clip {
+    position: absolute;
+    bottom: 2px;
+    height: 5px;
+    -webkit-transform: translateZ(0);
+}
\ No newline at end of file