[MERGE] from upstream

bzr revid: fva@openerp.com-20130805120523-ux0vnixhbe59pvrf bzr revid: fva@openerp.com-20130805123836-1vhj1e5mb0ejiu9j
2013-08-05 14:38:36 +02:00
parent 7664044486 b1f0bc68c6
commit c7ae298ad5
48 changed files with 1415 additions and 930 deletions
@@ -45,3 +45,11 @@
 .oe_editable:focus {
  outline: #80b5f2 solid 5px !important;
 }
+
+.oe_carousel_options {
+  cursor: pointer;
+  position: absolute;
+  white-space: nowrap;
+  z-index: 1;
+  display: none;
+}