[MERGE] from trunk

bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od

2 files changed, 0 insertions, 10 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e734525ee08..354796a053e 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -414,9 +414,6 @@ div.carousel .carousel-indicators .active {
 .oe_dark {
   background: #eff8f8;
   background: rgba(200, 200, 200, 0.14);
-  -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
-  -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
-  box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
 }
 
 .oe_black {
@@ -530,9 +527,3 @@ span[data-oe-type="monetary"] {
   width: 400px;
   margin: 40px auto;
 }
-
-.oe_website_overflow_ellipsis{
-  white-space:nowrap;
-  overflow:hidden;
-  text-overflow:ellipsis;
-}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 3bdda2cb720..77da53c2958 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -342,7 +342,6 @@ div.carousel
 .oe_dark
     background: #eff8f8
     background: rgba(200, 200, 200, 0.14)
-    +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset)
 
 .oe_black
     background-color: rgba(0, 0, 0, 0.9)