diff options
author | John Mayhew | 2012-07-09 17:28:24 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /node_modules/montage/ui/video-player.reel | |
parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'node_modules/montage/ui/video-player.reel')
3 files changed, 63 insertions, 60 deletions
diff --git a/node_modules/montage/ui/video-player.reel/video-player.css b/node_modules/montage/ui/video-player.reel/video-player.css index dd082439..1b99cb04 100755 --- a/node_modules/montage/ui/video-player.reel/video-player.css +++ b/node_modules/montage/ui/video-player.reel/video-player.css | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -44,9 +45,9 @@ MARK: media | |||
44 | position: absolute; | 45 | position: absolute; |
45 | display: -webkit-box; | 46 | display: -webkit-box; |
46 | -webkit-box-sizing: border-box; | 47 | -webkit-box-sizing: border-box; |
47 | z-index: 1000; /* TODO: Define global z-index regions */ | 48 | z-index: 1000; /* TODO: Define global z-index regions */ |
48 | top: 0; | 49 | top: 0; |
49 | left: 0; | 50 | left: 0; |
50 | border: none; | 51 | border: none; |
51 | width: 100%; | 52 | width: 100%; |
52 | height: 100%; | 53 | height: 100%; |
@@ -66,15 +67,15 @@ MARK: Controller | |||
66 | .montage-video-player .control-wrapper { | 67 | .montage-video-player .control-wrapper { |
67 | position: absolute; | 68 | position: absolute; |
68 | left: 0; | 69 | left: 0; |
69 | bottom: 0; | 70 | bottom: 0; |
70 | right: 0; | 71 | right: 0; |
71 | height: 50px; | 72 | height: 50px; |
72 | box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4); | 73 | box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4); |
73 | background-color: hsla(0,0%,0%,.95); | 74 | background-color: hsla(0,0%,0%,.95); |
74 | background-image: -webkit-linear-gradient(top, hsla(0,0%,100%,.27) 0%, | 75 | background-image: -webkit-linear-gradient(top, hsla(0,0%,100%,.27) 0%, |
75 | hsla(0,0%,100%,.15) 50%, | 76 | hsla(0,0%,100%,.15) 50%, |
76 | hsla(0,0%,30%,.4) 50%, | 77 | hsla(0,0%,30%,.4) 50%, |
77 | hsla(0,0%,0%,1) 100%); | 78 | hsla(0,0%,0%,1) 100%); |
78 | } | 79 | } |
79 | 80 | ||
80 | .montage-video-player .control-wrapper.hide-controls { | 81 | .montage-video-player .control-wrapper.hide-controls { |
@@ -170,7 +171,7 @@ MARK: Button Panel | |||
170 | background-position: center center; | 171 | background-position: center center; |
171 | } | 172 | } |
172 | .montage-video-player .controller-button:active { | 173 | .montage-video-player .controller-button:active { |
173 | background-color: hsla(0,0%,0%,.4); | 174 | background-color: hsla(0,0%,0%,.4); |
174 | } | 175 | } |
175 | 176 | ||
176 | .montage-video-player .play { background-image: url("images/play.png"); } | 177 | .montage-video-player .play { background-image: url("images/play.png"); } |
@@ -200,22 +201,22 @@ MARK: Volume Panel | |||
200 | 201 | ||
201 | .montage-video-player .controller-progress { | 202 | .montage-video-player .controller-progress { |
202 | height: 15px; | 203 | height: 15px; |
203 | box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5); | 204 | box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5); |
204 | background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px, | 205 | background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px, |
205 | hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px); | 206 | hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px); |
206 | } | 207 | } |
207 | .montage-video-player .controller-progress:before { | 208 | .montage-video-player .controller-progress:before { |
208 | content: ""; | 209 | content: ""; |
209 | position: absolute; | 210 | position: absolute; |
210 | top: 0; right: 0; bottom: 0; left: 0; | 211 | top: 0; right: 0; bottom: 0; left: 0; |
211 | background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) ); | 212 | background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) ); |
212 | } | 213 | } |
213 | 214 | ||
214 | .montage-video-player .volume-progress { | 215 | .montage-video-player .volume-progress { |
215 | width: 50%; | 216 | width: 50%; |
216 | height: 100%; | 217 | height: 100%; |
217 | background: -webkit-repeating-linear-gradient(left, hsl(195,90%,50%) 0, hsl(195,90%,50%) 3px, | 218 | background: -webkit-repeating-linear-gradient(left, hsl(195,90%,50%) 0, hsl(195,90%,50%) 3px, |
218 | transparent 3px, transparent 5px); | 219 | transparent 3px, transparent 5px); |
219 | -webkit-transition: width .1s ease-in-out; | 220 | -webkit-transition: width .1s ease-in-out; |
220 | } | 221 | } |
221 | 222 | ||
@@ -226,15 +227,15 @@ MARK: Volume Panel | |||
226 | 227 | ||
227 | .montage-video-player .volume-minus { background-image: url("images/volume-down.png"); } | 228 | .montage-video-player .volume-minus { background-image: url("images/volume-down.png"); } |
228 | .montage-video-player .volume-minus:active { | 229 | .montage-video-player .volume-minus:active { |
229 | background-color: transparent; | 230 | background-color: transparent; |
230 | background-image: url("images/volume-down.png"), | 231 | background-image: url("images/volume-down.png"), |
231 | -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); | 232 | -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); |
232 | } | 233 | } |
233 | .montage-video-player .volume-plus { background-image: url("images/volume-up.png"); } | 234 | .montage-video-player .volume-plus { background-image: url("images/volume-up.png"); } |
234 | .montage-video-player .volume-plus:active { | 235 | .montage-video-player .volume-plus:active { |
235 | background-color: transparent; | 236 | background-color: transparent; |
236 | background-image: url("images/volume-up.png"), | 237 | background-image: url("images/volume-up.png"), |
237 | -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); | 238 | -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) ); |
238 | } | 239 | } |
239 | 240 | ||
240 | .montage-video-player .controller-volume-panel .mute { display: none; } /* also MUTE[muted] */ | 241 | .montage-video-player .controller-volume-panel .mute { display: none; } /* also MUTE[muted] */ |
diff --git a/node_modules/montage/ui/video-player.reel/video-player.html b/node_modules/montage/ui/video-player.reel/video-player.html index 0f9c114a..582c1667 100755 --- a/node_modules/montage/ui/video-player.reel/video-player.html +++ b/node_modules/montage/ui/video-player.reel/video-player.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |