[IMP] website: clean css code for banner

bzr revid: chm@openerp.com-20131210120857-ii53g67n42sha51b

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 6cf3cd9..c3cb83b 100644 (file)
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -344,30 +344,27 @@ ul.nav-stacked > li > a {
 .carousel.oe_big .carousel-inner {
   height: 450px;
 }
+.carousel .carousel-caption {
+  left: auto;
+  right: auto;
+  bottom: 10%;
+  text-align: left;
+  padding: 20px;
+  background: rgba(0, 0, 0, 0.4);
+}
 .carousel .carousel-caption h1, .carousel .carousel-caption h2, .carousel .carousel-caption h3 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
 .carousel .carousel-image {
-  right: 10%;
+  right: 50%;
   left: 50%;
   top: 5%;
   bottom: 5%;
   position: absolute;
-  text-align: center;
-}
-.carousel .carousel-image img {
-  height: 100%;
+  max-height: 90%;
   margin: 0 auto;
 }
-.carousel .item.text_image .carousel-caption {
-  left: auto;
-  right: auto;
-  bottom: 10%;
-  text-align: left;
-  padding: 20px;
-  background: rgba(0, 0, 0, 0.4);
-}
 .carousel .item.text_only .carousel-image {
   display: none !important;
 }
@@ -375,18 +372,14 @@ ul.nav-stacked > li > a {
   left: 10%;
   right: 10%;
   top: 10%;
+  bottom: auto;
   text-align: center;
+  background: transparent;
 }
 .carousel .item.image_text .carousel-caption {
-  left: auto;
-  text-align: left;
   right: 10%;
-  bottom: 10%;
-  padding: 20px;
-  background: rgba(0, 0, 0, 0.4);
 }
 .carousel .item.image_text .carousel-image {
-  right: 50%;
   left: 10%;
 }
 .carousel .carousel-control {

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index fb905fd..a8c4614 100644 (file)
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -251,27 +251,23 @@ ul.nav-stacked > li > a
     &.oe_big .carousel-inner
         height: 450px
     .carousel-caption
+        left: auto
+        right: auto
+        bottom: 10%
+        text-align: left
+        padding: 20px
+        background: rgba(0, 0, 0, 0.4)
         h1, h2, h3
             margin-top: 10px
             margin-bottom: 10px
     .carousel-image
-        right: 10%
+        right: 50%
         left: 50%
         top: 5%
         bottom: 5%
         position: absolute
-        text-align: center
-        img
-            height: 100%
-            margin: 0 auto
-    .item.text_image
-        .carousel-caption
-            left: auto
-            right: auto
-            bottom: 10%
-            text-align: left
-            padding: 20px
-            background: rgba(0, 0, 0, 0.4)
+        max-height: 90%
+        margin: 0 auto
     .item.text_only
         .carousel-image
             display: none !important
@@ -279,17 +275,13 @@ ul.nav-stacked > li > a
             left: 10%
             right: 10%
             top: 10%
+            bottom: auto
             text-align: center
+            background: transparent
     .item.image_text
         .carousel-caption
-            left: auto
-            text-align: left
             right: 10%
-            bottom: 10%
-            padding: 20px
-            background: rgba(0, 0, 0, 0.4)
         .carousel-image
-            right: 50%
             left: 10%
     .carousel-control
         cursor: pointer

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 16e76ee..a014f59 100644 (file)
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1313,7 +1313,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-image img, .content').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image, .content').attr('contentEditable', 'true');
             this._super();
         },
     });

diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index abd419f..43411ea 100644 (file)
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -40,9 +40,7 @@
                                 <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
                             </p>
                         </div>
-                        <div class="carousel-image hidden-xs">
-                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/>
-                        </div>
+                        <img class="carousel-image hidden-xs" src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/>
                     </div>
                 </div>
             </div>