Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

1 files changed, 6 insertions, 9 deletions

diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
index 123c4a0f..2494614b 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
@@ -18,7 +18,6 @@
         display: box;
         box-pack: center;
         box-align: center;
-
 }
 
 .montage-google-picasa-carousel .flow {
@@ -28,17 +27,15 @@
             left: 0;
             right: 0;
             bottom: 0;
-*/            -webkit-perspective: 800px;
-            /*background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));*/
+*/
+    background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));
 }
 .image {
-            position: absolute;
-/*            -top: 50%;
-*/            -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5);
+    position: absolute;
+    /*-top: 50%;*/
+    -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5);
 }
 
 .montage-google-picasa-carousel .flow .montage-flow-repetition {
-margin: 10% 0;
-
+    margin: 10% 0;
 }
-    </style>