diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/scroll-bars.reel | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/scroll-bars.reel')
-rw-r--r-- | node_modules/montage/ui/scroll-bars.reel/scroll-bars.css | 67 | ||||
-rw-r--r-- | node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | 120 |
2 files changed, 96 insertions, 91 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 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .montage-scroll-bars { | ||
8 | position: absolute; | ||
9 | left: 0; | ||
10 | top: 0; | ||
11 | right: 0; | ||
12 | bottom: 0; | ||
13 | z-index: 9999; | ||
14 | pointer-events: none; | ||
15 | } | ||
16 | .montage-scroll-bars .top { | ||
17 | position: absolute; | ||
18 | right: 2px; | ||
19 | background: black; | ||
20 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
21 | width: 5px; | ||
22 | height: 3px; | ||
23 | border-radius: 4px 4px 0 0; | ||
24 | opacity: 0; | ||
25 | clip: rect(-1px, 6px, 3px, -1px); | ||
26 | -webkit-transform: translateZ(0); | ||
27 | } | ||
28 | .montage-scroll-bars .bottom { | ||
29 | background: black; | ||
30 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
31 | width: 5px; | ||
32 | border-radius: 0 0 4px 4px; | ||
33 | opacity: 0; | ||
34 | -webkit-transform: translateZ(0); | ||
35 | } | ||
36 | .montage-scroll-bars .bottom-clip { | ||
37 | position: absolute; | ||
38 | right: 2px; | ||
39 | width: 5px; | ||
40 | -webkit-transform: translateZ(0); | ||
41 | } | ||
42 | .montage-scroll-bars .left { | ||
43 | position: absolute; | ||
44 | bottom: 2px; | ||
45 | background: black; | ||
46 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
47 | width: 3px; | ||
48 | height: 5px; | ||
49 | border-radius: 4px 0 0 4px; | ||
50 | opacity: 0; | ||
51 | clip: rect(-1px, 3px, 6px, -1px); | ||
52 | -webkit-transform: translateZ(0); | ||
53 | } | ||
54 | .montage-scroll-bars .right { | ||
55 | background: black; | ||
56 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
57 | height: 5px; | ||
58 | border-radius: 0 4px 4px 0; | ||
59 | opacity: 0; | ||
60 | -webkit-transform: translateZ(0); | ||
61 | } | ||
62 | .montage-scroll-bars .right-clip { | ||
63 | position: absolute; | ||
64 | bottom: 2px; | ||
65 | height: 5px; | ||
66 | -webkit-transform: translateZ(0); | ||
67 | } \ No newline at end of file | ||
diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html index 4be1e1b6..705e0cc2 100644 --- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html +++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | |||
@@ -5,100 +5,38 @@ | |||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" href="scroll-bars.css"> | ||
10 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
11 | { | 12 | { |
12 | "owner": { | 13 | "owner": { |
13 | "properties": { | 14 | "properties": { |
14 | "element": { | 15 | "element": { |
15 | "#": "montage-scroll-bars" | 16 | "#": "montage-scroll-bars" |
16 | }, | 17 | }, |
17 | "_top": { | 18 | "_top": { |
18 | "#": "top" | 19 | "#": "top" |
19 | }, | 20 | }, |
20 | "_bottomClip": { | 21 | "_bottomClip": { |
21 | "#": "bottom-clip" | 22 | "#": "bottom-clip" |
22 | }, | 23 | }, |
23 | "_bottom": { | 24 | "_bottom": { |
24 | "#": "bottom" | 25 | "#": "bottom" |
25 | }, | 26 | }, |
26 | "_left": { | 27 | "_left": { |
27 | "#": "left" | 28 | "#": "left" |
28 | }, | 29 | }, |
29 | "_rightClip": { | 30 | "_rightClip": { |
30 | "#": "right-clip" | 31 | "#": "right-clip" |
31 | }, | 32 | }, |
32 | "_right": { | 33 | "_right": { |
33 | "#": "right" | 34 | "#": "right" |
34 | } | ||
35 | } | ||
36 | } | 35 | } |
37 | } | 36 | } |
37 | } | ||
38 | } | ||
38 | </script> | 39 | </script> |
39 | <style> | ||
40 | .montage-scroll-bars { | ||
41 | position: absolute; | ||
42 | left: 0; | ||
43 | top: 0; | ||
44 | right: 0; | ||
45 | bottom: 0; | ||
46 | z-index: 9999; | ||
47 | pointer-events: none; | ||
48 | } | ||
49 | .montage-scroll-bars .top { | ||
50 | position: absolute; | ||
51 | right: 2px; | ||
52 | background: black; | ||
53 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
54 | width: 5px; | ||
55 | height: 3px; | ||
56 | border-radius: 4px 4px 0 0; | ||
57 | opacity: 0; | ||
58 | clip: rect(-1px, 6px, 3px, -1px); | ||
59 | -webkit-transform: translateZ(0); | ||
60 | } | ||
61 | .montage-scroll-bars .bottom { | ||
62 | background: black; | ||
63 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
64 | width: 5px; | ||
65 | border-radius: 0 0 4px 4px; | ||
66 | opacity: 0; | ||
67 | -webkit-transform: translateZ(0); | ||
68 | } | ||
69 | .montage-scroll-bars .bottom-clip { | ||
70 | position: absolute; | ||
71 | right: 2px; | ||
72 | width: 5px; | ||
73 | -webkit-transform: translateZ(0); | ||
74 | } | ||
75 | .montage-scroll-bars .left { | ||
76 | position: absolute; | ||
77 | bottom: 2px; | ||
78 | background: black; | ||
79 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
80 | width: 3px; | ||
81 | height: 5px; | ||
82 | border-radius: 4px 0 0 4px; | ||
83 | opacity: 0; | ||
84 | clip: rect(-1px, 3px, 6px, -1px); | ||
85 | -webkit-transform: translateZ(0); | ||
86 | } | ||
87 | .montage-scroll-bars .right { | ||
88 | background: black; | ||
89 | -webkit-box-shadow: 0 0 0 1px rgba(255,255,255,.27); | ||
90 | height: 5px; | ||
91 | border-radius: 0 4px 4px 0; | ||
92 | opacity: 0; | ||
93 | -webkit-transform: translateZ(0); | ||
94 | } | ||
95 | .montage-scroll-bars .right-clip { | ||
96 | position: absolute; | ||
97 | bottom: 2px; | ||
98 | height: 5px; | ||
99 | -webkit-transform: translateZ(0); | ||
100 | } | ||
101 | </style> | ||
102 | </head> | 40 | </head> |
103 | <body> | 41 | <body> |
104 | <div data-montage-id="montage-scroll-bars" class="montage-scroll-bars"> | 42 | <div data-montage-id="montage-scroll-bars" class="montage-scroll-bars"> |
@@ -112,4 +50,4 @@ | |||
112 | </div> | 50 | </div> |
113 | </div> | 51 | </div> |
114 | </body> | 52 | </body> |
115 | </html> | 53 | </html> \ No newline at end of file |