Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration

4 files changed, 29 insertions, 5 deletions

diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 3677d976..82bec34f 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -67,6 +67,24 @@ exports.stylePresets = {
                         "text-shadow": "1px 1px 3px #333"
                     }
                 }]
+            },
+            {
+                "text": "White Sans-Serif",
+                "selectorBase" : "white-sans-serif",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "color": "#FFFFFF",
+                        "font-family": "helvetica,arial,sans-serif"
+                    }
+                },
+                {
+                    "selectorSuffix" : " h2",
+                    "styles" : {
+                        "color": "#C1C1C1",
+                        "font-family": "helvetica,arial,sans-serif"
+                    }
+                }]
             }]
     }]
 };
\ No newline at end of file
diff --git a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
index b78d2516..15dc7eb0 100644
--- a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
@@ -69,7 +69,6 @@
            margin-bottom: 12px;           
        }
        .feed-entry .entry-title {
-           color: #404040;
            font-weight: bold;
        }
        .feed-entry .entry-url {
diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html
index e6c2f5b5..646c87f8 100644
--- a/node_modules/montage/ui/flow.reel/flow.html
+++ b/node_modules/montage/ui/flow.reel/flow.html
@@ -35,7 +35,7 @@
     <style>
         .montage-flow {
             position: relative;
-            /*overflow: hidden;*/
+            overflow: hidden;
             -webkit-transform: translateZ(0);
         }
         .montage-flow-repetition {
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index b41df9a6..bdc74c83 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
@@ -111,10 +111,17 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
 
             handleSearchRequestLoad: {
                 value: function(evt) {
-                    var response = JSON.parse(evt.target.responseText);
+                    var response = JSON.parse(evt.target.responseText),
+                    previousOrigin = this.flow.origin;
                     this.searchResults = response.feed.entry;
-                this.flow.length = this.initialPosition;
-                this.flow.origin = this.initialPosition;
+                if (this.flow.length === 0) {
+                    this.flow.length = this.initialPosition;
+                }
+                if (previousOrigin === 0) {
+                    this.flow.origin = this.initialPosition;
+                } else {
+                    this.flow.origin = previousOrigin;
+                }
                     this.isSearching = false;
                 }
             },