[MERGE] website: mutation snippets

bzr revid: fva@openerp.com-20130826091819-z5nbw0jww7w7ydbl

4 files changed, 30 insertions, 6 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index bd68855d6ed..8f810f328d6 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 .oe_hidden {
   display: none !important;
 }
@@ -80,7 +79,6 @@
   border-radius: 3px;
   margin: 10px;
   margin-right: 0px;
-  cursor: move;
   position: relative;
   box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.2);
   overflow: hidden;
@@ -146,6 +144,16 @@
   border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
 
+.oe_hover_zone {
+  position: absolute;
+  background: rgba(153, 0, 255, 0.17);
+  border-radius: 3px;
+}
+.oe_hover_zone.oe_hover {
+  background: rgba(0, 255, 133, 0.22);
+  z-index: 100000;
+}
+
 .oe_stop_scrolling {
   height: 100%;
   overflow: hidden;
@@ -158,7 +166,6 @@
   border-radius: 10px;
   border-color: #1a1a1a;
   margin: auto;
-  position: absolute;
   top: 0;
   left: 0;
   bottom: 0;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7ed368aca47..9ac81414eba 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -71,7 +71,6 @@
     border-radius: 3px
     margin: 10px
     margin-right: 0px
-    cursor: move
     position: relative
     box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
     overflow: hidden
@@ -128,6 +127,15 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
+.oe_hover_zone
+    position: absolute
+    background: rgba(153, 0, 255, 0.17)
+    border-radius: 3px
+
+    &.oe_hover
+        background: rgba(0, 255, 133, 0.22)
+        z-index: 100000
+
 .oe_stop_scrolling
     height: 100%
     overflow: hidden
@@ -142,7 +150,6 @@ $mobile_preview_close: #E00101
     border-radius: 10px
     border-color: $mobile_preview_border
     margin: auto
-    position: absolute
     top: 0
     left: 0
     bottom: 0
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index eea25bea19d..2ba763f402e 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
@@ -159,3 +158,9 @@ header.navbar-fixed-top {
   min-height: 300px;
   color: white;
 }
+
+.dark {
+  background: #eff8f8;
+  padding-top: 32px;
+  padding-bottom: 32px;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 13037deb2d7..0440a71624f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -119,4 +119,9 @@ header.navbar-fixed-top
     min-height: 300px
     color: white
 
+.dark
+    background: rgb(239, 248, 248)
+    padding-top: 32px
+    padding-bottom: 32px
+