From 13dc16678356926e4782cb73eb7c58092eecbfc8 Mon Sep 17 00:00:00 2001
From: François Frisch
Date: Wed, 21 Mar 2012 11:40:37 -0700
Subject: Making flow flat on stage

---
 node_modules/montage/ui/flow.reel/flow.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 {
-- 
cgit v1.2.3


From 6f995a7ea1f35632fa54ad007953377bdf119c3a Mon Sep 17 00:00:00 2001
From: François Frisch
Date: Wed, 21 Mar 2012 11:48:30 -0700
Subject: Flow doesn't reset to origin 0 when changing the feed

---
 .../montage/ui/picasa-carousel.reel/picasa-carousel.js      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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;
 	        }
 	    },
-- 
cgit v1.2.3


From 0a601adc97f58673c2a720ee61f4c7d7e7bfb68f Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 21 Mar 2012 12:26:45 -0700
Subject: Presets Panel - Add Font style preset

---
 js/panels/presets/default-style-presets.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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
-- 
cgit v1.2.3


From 2a6e1fb035e2403ee2c745e14c5a186920f367d9 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 21 Mar 2012 12:27:10 -0700
Subject: Feed Reader - Remove hard-coded font color for feed reader

---
 node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html | 1 -
 1 file changed, 1 deletion(-)

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 {
-- 
cgit v1.2.3