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

bzr revid: bth@tinyerp.com-20131111094934-qh95bt41fptwepm0

2 files changed, 41 insertions, 4 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 698c5794236..70e2994eb65 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -361,8 +361,7 @@ footer {
 }
 
 .parallax {
-  background-attachment: fixed;
-  background-size: 100%;
+  position: relative;
 }
 .parallax.oe_small {
   height: 200px;
@@ -455,3 +454,24 @@ table.well tr td span {
 .logo-img {
   width: 220px;
 }
+
+.oe_demo {
+  position: relative;
+}
+.oe_demo img {
+  width: 100%;
+}
+.oe_demo div {
+  position: absolute;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  opacity: 0.85;
+  bottom: 0px;
+  width: 100%;
+  padding: 7px;
+  color: white;
+  font-weight: bold;
+}
+.oe_demo div a {
+  color: white;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 61de135f6a0..f35f951b8f6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -276,8 +276,7 @@ footer
             background-color: grey
 
 .parallax
-    background-attachment: fixed
-    background-size: 100%
+    position: relative
     &.oe_small
         height: 200px
     &.oe_medium
@@ -347,3 +346,21 @@ table.well tr
 
 .logo-img
     width: 220px
+
+
+.oe_demo
+    position: relative
+    img
+        width: 100%
+    div
+        position: absolute
+        left: 0
+        background-color: rgba(0,0,0,0.4)
+        opacity: 0.85
+        bottom: 0px
+        width: 100%
+        padding: 7px
+        color: white
+        font-weight: bold
+        a
+            color: white