Merged trunk-website-al

bzr revid: ddm@openerp.com-20130910103353-j5sbly1v6m93qiel

1 files changed, 55 insertions, 8 deletions

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 93566cf16c0..2ce32a8a6bb 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,11 +129,14 @@ table.editorbar-panel
         line-height: 120px
         color: white
         text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95)
+        box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset
 
     .oe_snippet_body
         display: none
     & > *
         pointer-events: none
+    & > :not(.oe_snippet_body):not(.oe_snippet_thumbnail)
+        display: none !important
 
     & > *:first-child:not(.oe_snippet_thumbnail)
         display: block
@@ -186,31 +189,58 @@ table.editorbar-panel
 .oe_snippet_manipulator
     display: block
     position: absolute
-    background: rgba(153, 0, 255, 0.1)
+    background: transparent //rgba(153, 0, 255, 0.05)
     border-radius: 3px
-    border: solid 1px rgba(153, 0, 255, 0.5)
     opacity: 0
     transition: opacity 100ms linear
-    & > .oe_handle
+    box-sizing: border-box
+    pointer-events: none
+    .oe_boxsize, .oe_margin
+        position: absolute
+        pointer-events: none
+    .oe_handle
         display: none
-    &:hover,&.oe_hover
+    &.oe_hover
+        opacity: 1
+        cursor: pointer
+    &.oe_selected, &.oe_active, .oe_boxsize, .oe_margin
         opacity: 1
-        & > .oe_handle
+        background: transparent
+        border: dashed 1px rgba(153, 0, 255, 0.5)
+        box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
+        .oe_handle
+            pointer-events: auto
+    .oe_buttons
+        display: none
+        position: absolute
+        right: 16px
+        top: 16px
+        background: rgb(173, 0, 255)
+        color: white
+        padding: 0px 2px
+        border-radius: 3px
+        .oe_icon
+            display: inline-block
+            padding: 8px
+            cursor: pointer
+    &.oe_active
+        z-index: 100000
+        .oe_handle, .oe_buttons
             display: block
 
 .oe_handle
+    pointer-events: auto
     position: absolute
     top: 50%
     left: 50%
     display: block
     background: rgba(255, 255, 255, 1)
-    border: solid 1px rgba(153, 0, 255, 0.5)
+    border: solid 1px rgba(153, 0, 255, 1)
     box-sizing: border-box
-    border-radius: 2px
+    border-radius: 8px
     width: 16px
     height: 16px
     margin: -8px
-    cursor: move
     -webkit-transition: background 100ms linear
     &:hover
         background: rgb(153, 0, 255)
@@ -225,6 +255,23 @@ table.editorbar-panel
     bottom: 0px
 .oe_handle.nw,.oe_handle.w,.oe_handle.sw
     left: 0px
+.oe_handle.n
+    cursor: n-resize
+.oe_handle.ne
+    cursor: ne-resize
+.oe_handle.nw
+    cursor: nw-resize
+.oe_handle.s
+    cursor: s-resize
+.oe_handle.se
+    cursor: se-resize
+.oe_handle.sw
+    cursor: sw-resize
+.oe_handle.e
+    cursor: e-resize
+.oe_handle.w
+    cursor: w-resize
+
 
 /* ---- MOBILE PREVIEW ---- */