diff options
author | Jon Reid | 2012-06-25 11:07:33 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css | |
parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css')
-rwxr-xr-x | node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css index 2494614b..b60493bf 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css | |||
@@ -3,39 +3,18 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<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. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | |||
7 | |||
6 | .montage-google-picasa-carousel { | 8 | .montage-google-picasa-carousel { |
7 | width: 100%; | 9 | width: 100%; |
8 | height: 100%; | 10 | height: 100%; |
9 | display: -webkit-box; | 11 | -webkit-transform-style: preserve-3d; |
10 | -webkit-box-pack: center; | ||
11 | -webkit-box-align: center; | ||
12 | display: -moz-box; | ||
13 | -moz-box-pack: center; | ||
14 | -moz-box-align: center; | ||
15 | display: -ms-box; | ||
16 | -ms-box-pack: center; | ||
17 | -ms-box-align: center; | ||
18 | display: box; | ||
19 | box-pack: center; | ||
20 | box-align: center; | ||
21 | } | 12 | } |
22 | 13 | ||
23 | .montage-google-picasa-carousel .flow { | 14 | .montage-google-picasa-carousel .flow { |
24 | width: 100%; | 15 | width: 100%; |
25 | height: 100%; | 16 | height: 100%; |
26 | /* top: 0; | ||
27 | left: 0; | ||
28 | right: 0; | ||
29 | bottom: 0; | ||
30 | */ | ||
31 | background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); | ||
32 | } | ||
33 | .image { | ||
34 | position: absolute; | ||
35 | /*-top: 50%;*/ | ||
36 | -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5); | ||
37 | } | ||
38 | 17 | ||
39 | .montage-google-picasa-carousel .flow .montage-flow-repetition { | 18 | -webkit-transform-style: preserve-3d; |
40 | margin: 10% 0; | 19 | -webkit-perspective: 1400px; |
41 | } | 20 | } |