[FIX] website snippet: drop zone for column with firefox

bzr revid: chm@openerp.com-20130920100821-qyy7n8j8612pzg3k

4 files changed, 17 insertions, 14 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index b1d54611a76..3cf2daebebf 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -231,6 +231,10 @@ table.editorbar-panel td.selected {
 }
 
 /* ---- SNIPPETS DROP ZONES ---- */
+.col-md-12[data-snippet-id="colmd"] {
+  float: left;
+}
+
 .oe_drop_zone.oe_insert {
   display: block;
   height: 48px;
@@ -241,7 +245,7 @@ table.editorbar-panel td.selected {
   position: absolute;
   z-index: 1000;
 }
-.oe_drop_zone.oe_insert:before {
+.oe_drop_zone.oe_insert:not(.oe_vertical):before {
   content: "";
   display: block;
   border-top: dashed 2px rgba(209, 178, 255, 0.72);
@@ -252,10 +256,10 @@ table.editorbar-panel td.selected {
   border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
 .oe_drop_zone.oe_insert.oe_vertical {
-  width: 16px;
-  display: inline-block;
-  position: absolute;
-  margin: 0px !important;
+  width: 24px;
+  float: left;
+  position: relative;
+  margin: 0px -12px !important;
 }
 .oe_drop_zone.oe_insert.oe_overlay {
   background: rgba(153, 0, 255, 0.17);
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index a0c26e79ccf..09fb88511c6 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -206,7 +206,8 @@ table.editorbar-panel
 /* ---- SNIPPETS DROP ZONES ---- */
 
 
-
+.col-md-12[data-snippet-id="colmd"]
+    float: left
 .oe_drop_zone.oe_insert
     display: block
     height: 48px
@@ -216,7 +217,7 @@ table.editorbar-panel
     width: 100%
     position: absolute
     z-index: 1000
-    &:before
+    &:not(.oe_vertical):before
         content: ""
         display: block
         border-top: dashed 2px rgba(209, 178, 255, 0.72)
@@ -225,10 +226,10 @@ table.editorbar-panel
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
     &.oe_vertical
-        width: 16px
-        display: inline-block
-        position: absolute
-        margin: 0px !important
+        width: 24px
+        float: left
+        position: relative
+        margin: 0px -12px !important
     &.oe_overlay
         background: rgba(153, 0, 255, 0.17)
         border-radius: 3px
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index e4e43adbe0d..45733a211f1 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -616,7 +616,7 @@
                     top: 14
                 },
                 helper: function() {
-                    var $clone = $(this).clone().css({width: "24px", height: "50px", border: 0});
+                    var $clone = $(this).clone().css({width: "24px", height: "24px", border: 0});
                     $clone.find(".oe_overlay_options >:not(.oe_snippet_move), .oe_handle").remove();
                     $clone.find(":not(.glyphicon)").css({position: 'absolute', top: 0, left: 0});
                     return $clone.appendTo("body").removeClass("hidden");
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index ea62f25fcad..279a362fec7 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -447,8 +447,6 @@
                         <h2>OpenERP HR Features</h2>
                         <h3 class="text-muted">Manage your company most important asset: People</h3>
                     </div>
-                </div>
-                <div class="row">
                     <div class="col-md-4">
                         <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
                         <h4 class="mt16">Streamline Recruitments</h4>