[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20130930102430-vnjn78mn65mq03r0

2 files changed, 7 insertions, 15 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index f037f87b34f..80057dbf21d 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -345,18 +345,13 @@ footer {
 
 /* Parallax Theme */
 .parallax_full {
-  background: #eeeeee top left repeat;
+  background: #eeeeee bottom center repeat fixed;
   min-height: 650px;
   width: 100%;
-  overflow: hidden;
-  position: relative;
-}
-.parallax_full > img {
-  position: absolute;
-  top: 0;
-  left: 0;
 }
 
+/* overflow: hidden
+ * position: relative */
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal {
   overflow: hidden;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index ac85bf67ed3..b1f43b543a3 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -264,15 +264,12 @@ footer
 /* Parallax Theme */
 
 .parallax_full
-    background: #eee top left repeat
+    background: #eee bottom center repeat fixed
     min-height: 650px
     width: 100%
+/*
     overflow: hidden
-    position: relative
-    > img
-        position: absolute
-        top: 0
-        left: 0
+    position: relative */
 
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
@@ -309,4 +306,4 @@ ul.nav-stacked > li > a
     /*     display: block*/
 
 ::selection
-    background: rgba(150, 150, 220, 0.3)
\ No newline at end of file
+    background: rgba(150, 150, 220, 0.3)