diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /node_modules/montage-google/picasa-carousel.reel | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel')
3 files changed, 6 insertions, 6 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html index 56fd0d1c..473f8fcb 100644 --- a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html +++ b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -51,9 +51,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
51 | width: 206px; | 51 | width: 206px; |
52 | height: 140px; | 52 | height: 140px; |
53 | border: 2px solid #888; | 53 | border: 2px solid #888; |
54 | background-repeat: no-repeat; | 54 | background-repeat: no-repeat; |
55 | background-position: center center; | 55 | background-position: center center; |
56 | background-size: cover; | 56 | background-size: cover; |
57 | opacity: 0.999; | 57 | opacity: 0.999; |
58 | } | 58 | } |
59 | </style> | 59 | </style> |
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 2b6df08d..d158fe4b 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css | |||
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
32 | .montage-google-picasa-carousel { | 32 | .montage-google-picasa-carousel { |
33 | width: 100%; | 33 | width: 100%; |
34 | height: 100%; | 34 | height: 100%; |
35 | -webkit-transform-style: preserve-3d; | 35 | -webkit-transform-style: preserve-3d; |
36 | } | 36 | } |
37 | 37 | ||
38 | .montage-google-picasa-carousel .flow { | 38 | .montage-google-picasa-carousel .flow { |
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html index e2faf9d8..80827382 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |