From 195ebf72d02fa662bfe301e9cba2784487375792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 30 Jul 2013 18:03:17 +0200
Subject: replacing css madness by bootstrap, homepage is mostly ok, ecommerce
 is broken

bzr revid: fva@openerp.com-20130730160317-j5aj1ktxt3u5rlyf
---
 addons/website/static/src/css/editor.sass | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 addons/website/static/src/css/editor.sass

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
new file mode 100644
index 00000000000..3f672f822d7
--- /dev/null
+++ b/addons/website/static/src/css/editor.sass
@@ -0,0 +1,42 @@
+@charset "utf-8"
+
+.oe_website_editorbar
+    position: fixed
+    top: 0
+    right: 0
+    z-index: 10
+    display: block
+    width: 100%
+    padding: 10px
+    margin: 0px
+    z-index: 10000
+    background-color: #414141
+    background: -webkit-linear-gradient(#646060, #262626)
+    box-sizing: border-box
+    li
+        display: inline
+        color: #eee
+        &:hover
+            background: rgba(0,0,0,0.2)
+            text-shadow: black 0px 0px 3px
+            color: white
+
+.oe_website_editorbar .oe_rte_toolbar
+    div.dropdown
+        display: inline-block
+        li
+            display: list-item
+
+    button
+        font-family: FontAwesome
+        font-weight: normal
+        font-style: normal
+        text-decoration: inherit
+        &.oe_button_list
+            padding-right: 3px
+            &:after
+                content: "\F0D7"
+                padding-left: 6px
+
+.oe_editable:focus
+    outline: #80B5F2 solid 5px !important
-- 
cgit v1.2.3


From 3e373984a4547c144fea866b0ba132b84c31b965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 31 Jul 2013 09:56:11 +0200
Subject: making the editor bar the same height as the rest of openerp

bzr revid: fva@openerp.com-20130731075611-lurg5zye995r9te7
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3f672f822d7..f1208ca2a80 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -7,7 +7,7 @@
     z-index: 10
     display: block
     width: 100%
-    padding: 10px
+    padding: 2px
     margin: 0px
     z-index: 10000
     background-color: #414141
-- 
cgit v1.2.3


From 480630aecffc741a7267bfc8db4e81dd6a26e122 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Aug 2013 09:53:43 +0200
Subject: [IMP] remove big blue border around RTE sections

bzr revid: xmo@openerp.com-20130807075343-22er1l4ob6jbxczc
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f7e46cd19d1..24a549f1d05 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -39,7 +39,7 @@
                 padding-left: 6px
 
 .oe_editable:focus
-    outline: #80B5F2 solid 5px !important
+    outline: none !important
 
 .oe_carousel_options
     cursor: pointer
-- 
cgit v1.2.3


From 660e8798abdd73eb56f1b571654edb39707c24c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 19 Aug 2013 11:25:07 +0200
Subject: [WIP] website: Cleaning up the snippet editor

bzr revid: fva@openerp.com-20130819092507-s3d9wl1ph6z43thh
---
 addons/website/static/src/css/editor.sass | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 24a549f1d05..565e7571dca 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,5 +1,8 @@
 @charset "utf-8"
 
+.oe_hidden
+    display: none !important
+
 .oe_website_editorbar
     position: fixed
     top: 0
@@ -47,3 +50,26 @@
     white-space: nowrap
     z-index: 1
     display: none
+
+.oe_snippets
+    position: fixed
+    left: 0px
+    right: 0px
+    bottom: 0px
+    height: 120px
+    background: black
+
+    .oe_snippet
+        display: inline
+        .oe_snippet_thumbnail
+            display: inline-block
+            background: red
+            width: 100px
+            height: 100px
+            border-radius: 3px
+            margin: 10px
+
+        .oe_snippet_body
+            display: none
+
+
-- 
cgit v1.2.3


From 6284b4b925a17e6c463694758c23c4ecf87d7035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 20 Aug 2013 18:45:57 +0200
Subject: [WIP] cms: snippets are ugly but working well

bzr revid: fva@openerp.com-20130820164557-kjh87mrtv4tueln8
---
 addons/website/static/src/css/editor.sass | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 565e7571dca..a11a83c7f90 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -68,8 +68,31 @@
             height: 100px
             border-radius: 3px
             margin: 10px
+            cursor: move
 
         .oe_snippet_body
             display: none
 
+.oe_drop_zone
+    display: block
+    background: rgba(255,0,0,0.25)
+    border: solid 1px rgba(255,0,0,0.5)
+    height: 30px
+    margin: -16px 0px
+    &.oe_inline
+        display: inline
+        height: auto
+        width: 30px
+        margin: 0px -16px
+    &.oe_float_left
+        float: left
+    &.oe_float_right
+        float: right
+    &:hover
+        background: rgba(255,0,0,0.5)
+        border: solid 1px red
+    &.oe_hover
+        background: rgba(0,255,0,0.5)
+        border: solid 1px green
+
 
-- 
cgit v1.2.3


From 5848dc526f3f0b502e6952b2f74ea26c66509061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 21 Aug 2013 18:25:34 +0200
Subject: [IMP] website: basics of snippet system are now working and looking
 good

bzr revid: fva@openerp.com-20130821162534-yr6nx292xoj2m2s2
---
 addons/website/static/src/css/editor.sass | 93 +++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 30 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index a11a83c7f90..f7ce999257e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -56,43 +56,76 @@
     left: 0px
     right: 0px
     bottom: 0px
+    max-height: 280px
+    min-height: 140px
+    background: rgb(40,40,40)
+    box-shadow: 0px 10px 10px -10px black inset
+    overflow-y: auto
+
+.oe_snippet
+    display: inline-block
+    vertical-align: top
+    background: white
+    width: 120px
     height: 120px
-    background: black
+    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
+    -webkit-user-select: none
+    user-select: none
 
-    .oe_snippet
-        display: inline
-        .oe_snippet_thumbnail
-            display: inline-block
-            background: red
-            width: 100px
-            height: 100px
-            border-radius: 3px
-            margin: 10px
-            cursor: move
+    .oe_snippet_thumbnail.oe_label
+        text-align: center
+        background: rgb(116, 116, 116)
+        background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
+        height: 100%
+        line-height: 120px
+        color: white
+        text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95)
 
-        .oe_snippet_body
-            display: none
+    .oe_snippet_body
+        display: none
+    & > *
+        pointer-events: none
+
+    & > *:first-child:not(.oe_snippet_thumbnail)
+        display: block
+        -webkit-transform-origin-x: 5px
+        -webkit-transform-origin-y: 10px
+        -webkit-transform: scale(0.095)
+               
 
 .oe_drop_zone
     display: block
-    background: rgba(255,0,0,0.25)
-    border: solid 1px rgba(255,0,0,0.5)
-    height: 30px
+    background: rgba(153, 0, 255, 0.17)
+    border-radius: 3px
+    height: 32px
     margin: -16px 0px
-    &.oe_inline
-        display: inline
-        height: auto
-        width: 30px
-        margin: 0px -16px
-    &.oe_float_left
-        float: left
-    &.oe_float_right
-        float: right
-    &:hover
-        background: rgba(255,0,0,0.5)
-        border: solid 1px red
+    -webkit-transition: margin 250ms linear
+    &:first-child:not(:last-child)
+        margin-top: -8px
+        margin-bottom: -24px
+    &:last-child:not(:first-child)
+        margin-top: -24px
+        margin-bottom: -8px
     &.oe_hover
-        background: rgba(0,255,0,0.5)
-        border: solid 1px green
+        background: rgba(0, 255, 133, 0.22)
+        z-index: 100000
+    &:before
+        content: ""
+        display: block
+        border-top: dashed 2px rgba(209, 178, 255, 0.72)
+        position: relative
+        top: 16px
+    &:first-child:not(:last-child):before
+        top: 8px
+    &:last-child:not(:first-child):before
+        top: 24px
+    &.oe_hover:before
+        border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
 
-- 
cgit v1.2.3


From 7d40a7db38cd11ebb1b6cb3e1dc1a6f2f5cae255 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 22 Aug 2013 10:58:25 +0200
Subject: Mobile preview (initial commit)

bzr revid: ddm@openerp.com-20130822085825-7mpsoi0nyujekg5f
---
 addons/website/static/src/css/editor.sass | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f7ce999257e..4b3a8e98a91 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -128,4 +128,26 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
+.oe_stop_scrolling
+    height: 100%
+    overflow: hidden
+
+#mobile-preview.modal
+    height: 617px
+    margin: auto
+    position: absolute
+    top: 0
+    left: 0
+    bottom: 0
+    right: 0
+    max-width: 325px
+    width: 325px
+
+#mobile-preview .modal-body
+    max-height: 600px
+    padding: 0
+    margin: 0
 
+.oe_mobile_viewport
+    width: 320px
+    height: 568px
\ No newline at end of file
-- 
cgit v1.2.3


From b9f2e796ca8cb84e578a0856cb00a91211ed4007 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 22 Aug 2013 12:47:36 +0200
Subject: Mobile preview (initial styling)

bzr revid: ddm@openerp.com-20130822104736-5gt43278o83fvt9s
---
 addons/website/static/src/css/editor.sass | 38 ++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4b3a8e98a91..f324cabc348 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -71,7 +71,7 @@
     border-radius: 3px
     margin: 10px
     margin-right: 0px
-    cursor: move 
+    cursor: move
     position: relative
     box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
     overflow: hidden
@@ -97,7 +97,7 @@
         -webkit-transform-origin-x: 5px
         -webkit-transform-origin-y: 10px
         -webkit-transform: scale(0.095)
-               
+
 
 .oe_drop_zone
     display: block
@@ -133,21 +133,37 @@
     overflow: hidden
 
 #mobile-preview.modal
-    height: 617px
+    height: 660px
+    background-color: black
+    border: 2px solid
+    border-radius: 10px
     margin: auto
     position: absolute
     top: 0
     left: 0
     bottom: 0
     right: 0
-    max-width: 325px
-    width: 325px
-
-#mobile-preview .modal-body
-    max-height: 600px
-    padding: 0
-    margin: 0
+    max-width: 330px
+
+#mobile-preview
+    .modal-header
+        border-bottom: 0
+        border-top-left-radius: 10px
+        border-top-right-radius: 10px
+    .modal-body
+        max-height: 600px
+        padding: 0
+        margin: 0
 
 .oe_mobile_viewport
     width: 320px
-    height: 568px
\ No newline at end of file
+    height: 568px
+    padding: 5px
+    border: none
+
+.oe_mobile_preview_header
+    .close
+        color: lightgrey
+        opacity: 1
+    .close:hover
+        color: darkgrey
-- 
cgit v1.2.3


From a2e4c9b7e0ccf6a8299fcfd9d721450a0c58e3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 10:27:12 +0200
Subject: [IMP] website: mutation snippets

bzr revid: fva@openerp.com-20130823082712-sdcke0hy5yspszkb
---
 addons/website/static/src/css/editor.sass | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f7ce999257e..322f182e0b5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -128,4 +128,14 @@
     &.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
+    
+
 
-- 
cgit v1.2.3


From 3ad504ffc432fe92baefbbc5429a3fabcacfd64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 11:07:57 +0200
Subject: [IMP] website: cleanup drop zones css and sort out z-index issues

bzr revid: fva@openerp.com-20130823090757-ffqvcselr1merggk
---
 addons/website/static/src/css/editor.sass | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3c54a0d0aaf..45078e12b0b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -51,6 +51,8 @@
     z-index: 1
     display: none
 
+/* ---- SNIPPET EDITOR ---- */
+
 .oe_snippets
     position: fixed
     left: 0px
@@ -61,6 +63,7 @@
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
+    z-index: 100
 
 .oe_snippet
     display: inline-block
@@ -76,6 +79,7 @@
     overflow: hidden
     -webkit-user-select: none
     user-select: none
+    cursor: move
 
     .oe_snippet_thumbnail.oe_label
         text-align: center
@@ -98,10 +102,11 @@
         -webkit-transform: scale(0.095)
 
 
-.oe_drop_zone
+/* ---- SNIPPETS DROP ZONES ---- */
+
+
+.oe_drop_zone.oe_insert
     display: block
-    background: rgba(153, 0, 255, 0.17)
-    border-radius: 3px
     height: 32px
     margin: -16px 0px
     -webkit-transition: margin 250ms linear
@@ -111,9 +116,6 @@
     &:last-child:not(:first-child)
         margin-top: -24px
         margin-bottom: -8px
-    &.oe_hover
-        background: rgba(0, 255, 133, 0.22)
-        z-index: 100000
     &:before
         content: ""
         display: block
@@ -127,14 +129,19 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
-.oe_hover_zone
+.oe_drop_zone.oe_mutate
     position: absolute
     background: rgba(153, 0, 255, 0.17)
     border-radius: 3px
 
+.oe_drop_zone
+    background: rgba(153, 0, 255, 0.17)
+    border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
-        z-index: 100000
+        z-index: 99
+
+/* ---- MOBILE PREVIEW ---- */
 
 .oe_stop_scrolling
     height: 100%
-- 
cgit v1.2.3


From 4fc8193e463c0ff8ad984ac4f490176618b1ba4d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 23 Aug 2013 11:24:56 +0200
Subject: CSS improvements

bzr revid: ddm@openerp.com-20130823092456-7g783rh2g0irlp63
---
 addons/website/static/src/css/editor.sass | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f324cabc348..7ed368aca47 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -132,11 +132,15 @@
     height: 100%
     overflow: hidden
 
+$mobile_preview_background: #000000
+$mobile_preview_border: #1A1A1A
+$mobile_preview_close: #E00101
 #mobile-preview.modal
     height: 660px
-    background-color: black
+    background-color: $mobile_preview_background
     border: 2px solid
     border-radius: 10px
+    border-color: $mobile_preview_border
     margin: auto
     position: absolute
     top: 0
@@ -144,16 +148,20 @@
     bottom: 0
     right: 0
     max-width: 330px
-
-#mobile-preview
     .modal-header
+        background-color: $mobile_preview_background
         border-bottom: 0
         border-top-left-radius: 10px
         border-top-right-radius: 10px
+        .oe_mobile_preview_title
+            color: $mobile_preview_border
     .modal-body
+        background-color: $mobile_preview_background
         max-height: 600px
         padding: 0
         margin: 0
+    .modal-footer
+        background-color: $mobile_preview_background
 
 .oe_mobile_viewport
     width: 320px
@@ -166,4 +174,5 @@
         color: lightgrey
         opacity: 1
     .close:hover
-        color: darkgrey
+        color: $mobile_preview_close
+        opacity: 1
-- 
cgit v1.2.3


From 306138327ff4e54f1c403559378cfbde3014d0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 18:04:11 +0200
Subject: [IMP] website: snippet resizing

bzr revid: fva@openerp.com-20130823160411-xoxek62wwhi5w3by
---
 addons/website/static/src/css/editor.sass | 47 ++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 45078e12b0b..dade66519a8 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,7 +129,7 @@
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
-.oe_drop_zone.oe_mutate
+.oe_drop_zone.oe_overlay
     position: absolute
     background: rgba(153, 0, 255, 0.17)
     border-radius: 3px
@@ -141,6 +141,51 @@
         background: rgba(0, 255, 133, 0.22)
         z-index: 99
 
+/* ---- SNIPPET MANIPULATOR ---- */
+
+.oe_snippet_manipulator
+    display: block
+    position: absolute
+    background: rgba(153, 0, 255, 0.1)
+    border-radius: 3px
+    border: solid 1px rgba(153, 0, 255, 0.5)
+    opacity: 0
+    transition: opacity 100ms linear
+    & > .oe_handle
+        display: none
+    &:hover,&.oe_hover
+        opacity: 1
+        & > .oe_handle
+            display: block
+
+.oe_handle
+    position: absolute
+    top: 50%
+    left: 50%
+    display: block
+    background: rgba(255, 255, 255, 1)
+    border: solid 1px rgba(153, 0, 255, 0.5)
+    box-sizing: border-box
+    border-radius: 2px
+    width: 16px
+    height: 16px
+    margin: -8px
+    cursor: move
+    -webkit-transition: background 100ms linear
+    &:hover
+        background: rgb(153, 0, 255)
+
+.oe_handle.nw,.oe_handle.n,.oe_handle.ne
+    top: 0px
+.oe_handle.ne,.oe_handle.e,.oe_handle.se
+    left: auto
+    right: 0px
+.oe_handle.sw,.oe_handle.s,.oe_handle.se
+    top: auto
+    bottom: 0px
+.oe_handle.nw,.oe_handle.w,.oe_handle.sw
+    left: 0px
+
 /* ---- MOBILE PREVIEW ---- */
 
 .oe_stop_scrolling
-- 
cgit v1.2.3


From bda0a4fa366de2ca208712910051462fd333fe40 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 09:04:35 +0200
Subject: SEO configurator mockup

bzr revid: ddm@openerp.com-20130827070435-bqrhg887ynz1f6ys
---
 addons/website/static/src/css/editor.sass | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 29621f95e4b..16ff37371ff 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -194,7 +194,7 @@
 
 $mobile_preview_background: #000000
 $mobile_preview_border: #1A1A1A
-$mobile_preview_close: #E00101
+$icon_close: #E00101
 #mobile-preview.modal
     height: 660px
     background-color: $mobile_preview_background
@@ -233,5 +233,15 @@ $mobile_preview_close: #E00101
         color: lightgrey
         opacity: 1
     .close:hover
-        color: $mobile_preview_close
+        color: $icon_close
         opacity: 1
+
+.oe_seo_configuration
+    input
+        width: inherit
+    textarea
+        width: inherit
+    ul
+        list-style: none
+    .oe_remove
+        color: $icon_close
-- 
cgit v1.2.3


From f880ce9ae7057628ded1337bab31f7dbff1bad90 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 09:48:16 +0200
Subject: Code cleanup

bzr revid: ddm@openerp.com-20130827074816-1kuvpbz6vubhel68
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 16ff37371ff..87e8715e931 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -195,7 +195,7 @@
 $mobile_preview_background: #000000
 $mobile_preview_border: #1A1A1A
 $icon_close: #E00101
-#mobile-preview.modal
+.oe_mobile_preview.modal
     height: 660px
     background-color: $mobile_preview_background
     border: 2px solid
-- 
cgit v1.2.3


From 5ddbdeac96ab3bb4acb339ff5a36368e047abcef Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 11:32:37 +0200
Subject: SEO keywords list mockup

bzr revid: ddm@openerp.com-20130827093237-v13oihsyhadl92w3
---
 addons/website/static/src/css/editor.sass | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 87e8715e931..571722d6466 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -245,3 +245,9 @@ $icon_close: #E00101
         list-style: none
     .oe_remove
         color: $icon_close
+
+.oe_seo_keywords_list
+    width: 35em
+    li
+        float: left
+        width: 10em
\ No newline at end of file
-- 
cgit v1.2.3


From be165dbb7a32a1990dcd151c4bb2e66ab3be91f1 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 13:35:50 +0200
Subject: SEO tools visual cleanup

bzr revid: ddm@openerp.com-20130827113550-xi8r0qs8oz2uu990
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 571722d6466..c75946d7c6b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -247,7 +247,7 @@ $icon_close: #E00101
         color: $icon_close
 
 .oe_seo_keywords_list
-    width: 35em
+    width: 39em
     li
         float: left
-        width: 10em
\ No newline at end of file
+        width: 12em
\ No newline at end of file
-- 
cgit v1.2.3


From 59819fac142e0a53e8c8ca06a8cb38d6b7dd8b59 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 27 Aug 2013 15:04:56 +0200
Subject: [IMP] cleaned CKEditor, minimal CSS change

bzr revid: fp@tinyerp.com-20130827130456-c3u40tesfalapj7z
---
 addons/website/static/src/css/editor.sass | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c75946d7c6b..031b27a10db 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,5 +1,22 @@
 @charset "utf-8"
 
+/* ---- CKEditor Minimal Reset ---- */
+
+.navbar.navbar-inverse .cke_chrome
+    border: none
+
+.navbar.navbar-inverse .cke_inner
+    background: transparent
+
+.navbar.navbar-inverse .cke_top
+    background: transparent
+    border: none
+    box-shadow: none
+    -webkit-box-shadow: none
+    -moz-box-shadow: none
+
+/* ---- OpenERP Style ---- */
+
 .oe_hidden
     display: none !important
 
@@ -250,4 +267,4 @@ $icon_close: #E00101
     width: 39em
     li
         float: left
-        width: 12em
\ No newline at end of file
+        width: 12em
-- 
cgit v1.2.3


From fcd97879e3cd57a15f91db81ff88da7c6c114b98 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 16:12:35 +0200
Subject: Improve SEO tools CSS across themes

bzr revid: ddm@openerp.com-20130827141235-wfrx21hqem1v076b
---
 addons/website/static/src/css/editor.sass | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 031b27a10db..330686d4bf0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -203,12 +203,14 @@
 .oe_handle.nw,.oe_handle.w,.oe_handle.sw
     left: 0px
 
-/* ---- MOBILE PREVIEW ---- */
+/* ---- MODAL DIALOGS ---- */
 
 .oe_stop_scrolling
     height: 100%
     overflow: hidden
 
+/* ---- MOBILE PREVIEW ---- */
+
 $mobile_preview_background: #000000
 $mobile_preview_border: #1A1A1A
 $icon_close: #E00101
@@ -247,24 +249,27 @@ $icon_close: #E00101
 
 .oe_mobile_preview_header
     .close
-        color: lightgrey
+        color: $mobile_preview_border
         opacity: 1
     .close:hover
         color: $icon_close
         opacity: 1
 
+/* ---- SEO TOOLS ---- */
+
+$remove_color: $icon_close
 .oe_seo_configuration
     input
-        width: inherit
+        width: 90%
     textarea
-        width: inherit
+        width: 90%
     ul
         list-style: none
     .oe_remove
-        color: $icon_close
+        color: $remove_color
 
 .oe_seo_keywords_list
-    width: 39em
+    width: 80%
     li
         float: left
-        width: 12em
+        width: 15em
-- 
cgit v1.2.3


From eb039323d27820bc64f7b42c490d60f570588b62 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 16:13:40 +0200
Subject: OOps

bzr revid: ddm@openerp.com-20130827141340-3ll60as5zpzp6l3v
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 330686d4bf0..1b2dae40f56 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -249,7 +249,7 @@ $icon_close: #E00101
 
 .oe_mobile_preview_header
     .close
-        color: $mobile_preview_border
+        color: lightgrey
         opacity: 1
     .close:hover
         color: $icon_close
-- 
cgit v1.2.3


From 3c9f07d244cb88efede8dd27c4786a90fea9932e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 28 Aug 2013 15:55:58 +0200
Subject: SEO: keyword suggest mockup

bzr revid: ddm@openerp.com-20130828135558-w4ysgixr6l7n45b5
---
 addons/website/static/src/css/editor.sass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 1b2dae40f56..74885a380ee 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -259,6 +259,10 @@ $icon_close: #E00101
 
 $remove_color: $icon_close
 .oe_seo_configuration
+    min-width: 42em
+    .modal-body
+        max-height: inherit
+        min-height: 27em
     input
         width: 90%
     textarea
@@ -269,7 +273,8 @@ $remove_color: $icon_close
         color: $remove_color
 
 .oe_seo_keywords_list
-    width: 80%
+    width: 100%
+    margin: 0.1em
     li
         float: left
-        width: 15em
+        width: 19em
-- 
cgit v1.2.3


From bc5c8a082894b824d3d9a83010b082031b07690a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 29 Aug 2013 18:39:52 +0200
Subject: SEO screen based on mockup (partial)

bzr revid: ddm@openerp.com-20130829163952-v41gi10q7ths1elt
---
 addons/website/static/src/css/editor.sass | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 74885a380ee..c32fcbc1c44 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -259,22 +259,24 @@ $icon_close: #E00101
 
 $remove_color: $icon_close
 .oe_seo_configuration
-    min-width: 42em
+    &.modal
+        width: 100%
+        left: 0
+        margin-left: 0
+        top: 0!important
+        margin-top: 0!important
+        height: 100%
     .modal-body
-        max-height: inherit
-        min-height: 27em
-    input
-        width: 90%
-    textarea
-        width: 90%
+        max-height: 100%
+        height: 100%
     ul
         list-style: none
     .oe_remove
         color: $remove_color
 
 .oe_seo_keywords_list
-    width: 100%
-    margin: 0.1em
-    li
+    &.container
+        margin: 0.1em
+    .oe_seo_keyword
         float: left
-        width: 19em
+        padding-right: 0.5em
-- 
cgit v1.2.3


From ccc3465dec7b4289b659caeb9db248d706b82690 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 30 Aug 2013 09:09:06 +0200
Subject: [IMP] bootstrap 3: oe_hidden -> hide

bzr revid: fp@tinyerp.com-20130830070906-f9gr24iq95oz6bp2
---
 addons/website/static/src/css/editor.sass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c32fcbc1c44..d74fb57234b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -17,9 +17,6 @@
 
 /* ---- OpenERP Style ---- */
 
-.oe_hidden
-    display: none !important
-
 .oe_website_editorbar
     position: fixed
     top: 0
-- 
cgit v1.2.3


From 3db7d635c00ea31454ad2d96872318b8cc36ad57 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 30 Aug 2013 13:21:24 +0200
Subject: Mobile preview + SEO: Bootstrap 3

bzr revid: ddm@openerp.com-20130830112124-ht5wnngxa8fwlrdh
---
 addons/website/static/src/css/editor.sass | 92 +++++++++++++------------------
 1 file changed, 37 insertions(+), 55 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d74fb57234b..dadf36a7cd4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -200,72 +200,54 @@
 .oe_handle.nw,.oe_handle.w,.oe_handle.sw
     left: 0px
 
-/* ---- MODAL DIALOGS ---- */
-
-.oe_stop_scrolling
-    height: 100%
-    overflow: hidden
-
 /* ---- MOBILE PREVIEW ---- */
 
 $mobile_preview_background: #000000
 $mobile_preview_border: #1A1A1A
 $icon_close: #E00101
-.oe_mobile_preview.modal
-    height: 660px
-    background-color: $mobile_preview_background
-    border: 2px solid
-    border-radius: 10px
-    border-color: $mobile_preview_border
-    margin: auto
-    top: 0
-    left: 0
-    bottom: 0
-    right: 0
-    max-width: 330px
-    .modal-header
-        background-color: $mobile_preview_background
-        border-bottom: 0
-        border-top-left-radius: 10px
-        border-top-right-radius: 10px
-        .oe_mobile_preview_title
-            color: $mobile_preview_border
-    .modal-body
+.oe_mobile_preview
+    &.modal .modal-content
+        height: 660px
         background-color: $mobile_preview_background
-        max-height: 600px
-        padding: 0
-        margin: 0
-    .modal-footer
-        background-color: $mobile_preview_background
-
-.oe_mobile_viewport
-    width: 320px
-    height: 568px
-    padding: 5px
-    border: none
-
-.oe_mobile_preview_header
-    .close
-        color: lightgrey
-        opacity: 1
-    .close:hover
-        color: $icon_close
-        opacity: 1
+        border: 2px solid
+        border-radius: 10px
+        border-color: $mobile_preview_border
+        margin: auto
+        top: 0
+        left: 0
+        bottom: 0
+        right: 0
+        max-width: 330px
+        .modal-header
+            background-color: $mobile_preview_background
+            border-bottom: 0
+            border-top-left-radius: 10px
+            border-top-right-radius: 10px
+            .modal-title
+                color: $mobile_preview_border
+            .close
+                color: lightgrey
+                opacity: 1
+            .close:hover
+                color: $icon_close
+                opacity: 1
+        .modal-body
+            background-color: $mobile_preview_background
+            max-height: 600px
+            padding: 0
+            margin: 0
+            .oe_mobile_viewport
+                width: 320px
+                height: 568px
+                padding: 5px
+                border: none
+        .modal-footer
+            background-color: $mobile_preview_background
 
 /* ---- SEO TOOLS ---- */
 
 $remove_color: $icon_close
 .oe_seo_configuration
-    &.modal
-        width: 100%
-        left: 0
-        margin-left: 0
-        top: 0!important
-        margin-top: 0!important
-        height: 100%
-    .modal-body
-        max-height: 100%
-        height: 100%
     ul
         list-style: none
     .oe_remove
-- 
cgit v1.2.3


From 8b0f006398b2c53b5d582b6b07d229987886fb6c Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 30 Aug 2013 15:19:52 +0200
Subject: Mobile preview & SEO: more Bootstrap 3 fixes

bzr revid: ddm@openerp.com-20130830131952-fmmnhvawlrbekxay
---
 addons/website/static/src/css/editor.sass | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index dadf36a7cd4..4f38f52c463 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -203,7 +203,7 @@
 /* ---- MOBILE PREVIEW ---- */
 
 $mobile_preview_background: #000000
-$mobile_preview_border: #1A1A1A
+$mobile_preview_border: #1C1F1F
 $icon_close: #E00101
 .oe_mobile_preview
     &.modal .modal-content
@@ -248,14 +248,13 @@ $icon_close: #E00101
 
 $remove_color: $icon_close
 .oe_seo_configuration
-    ul
-        list-style: none
-    .oe_remove
-        color: $remove_color
-
-.oe_seo_keywords_list
-    &.container
-        margin: 0.1em
-    .oe_seo_keyword
-        float: left
-        padding-right: 0.5em
+    .modal-dialog
+        width: 80%
+    .oe_seo_keywords_list
+        &.container
+            margin: 0.1em
+        .oe_seo_keyword
+            float: left
+            padding-right: 0.5em
+        .oe_remove
+            color: $remove_color
-- 
cgit v1.2.3


From c5fa23bffa8ccbc3db6a88be822c4f9209701ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 2 Sep 2013 11:10:05 +0200
Subject: [IMP] website editor: allow click trough on snippet manipulators

bzr revid: fva@openerp.com-20130902091005-pnhb05fxk29z5q0r
---
 addons/website/static/src/css/editor.sass | 32 ++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 29621f95e4b..feb7432821c 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -89,6 +89,7 @@
         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
@@ -146,27 +147,48 @@
 .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
+    box-sizing: border-box
     & > .oe_handle
         display: none
-    &:hover,&.oe_hover
+    &.oe_hover
+        opacity: 1
+        cursor: pointer
+    &.oe_selected
         opacity: 1
+        pointer-events: none
+        background: transparent
+        border: solid 1px rgba(153, 0, 255, 0.5)
+        & > *
+            pointer-events: auto
         & > .oe_handle
             display: block
+    .oe_buttons
+        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_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
-- 
cgit v1.2.3


From 6f6c59ec1de1881a70e4bf728ea5d8b56bd609f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 2 Sep 2013 11:20:38 +0200
Subject: [IMP] website: made widget manipulator visible on dark areas

bzr revid: fva@openerp.com-20130902092038-2dpxy9fidznaeclz
---
 addons/website/static/src/css/editor.sass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index feb7432821c..2f236c38aab 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -161,7 +161,8 @@
         opacity: 1
         pointer-events: none
         background: transparent
-        border: solid 1px rgba(153, 0, 255, 0.5)
+        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
         & > *
             pointer-events: auto
         & > .oe_handle
-- 
cgit v1.2.3


From f50b273ae12493e227806670d9a866b6be162551 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 11:37:55 +0200
Subject: SEO dialog (without save)

bzr revid: ddm@openerp.com-20130902093755-05wins912upe47qj
---
 addons/website/static/src/css/editor.sass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4f38f52c463..8672c40439c 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -250,11 +250,5 @@ $remove_color: $icon_close
 .oe_seo_configuration
     .modal-dialog
         width: 80%
-    .oe_seo_keywords_list
-        &.container
-            margin: 0.1em
-        .oe_seo_keyword
-            float: left
-            padding-right: 0.5em
-        .oe_remove
-            color: $remove_color
+    .oe_remove
+        color: $remove_color
-- 
cgit v1.2.3


From e44332e5f7a50302cb1698a3ba8395d242e4d11b Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 15:39:23 +0200
Subject: SEO bugfixes

bzr revid: ddm@openerp.com-20130902133923-hhzfe0gv4t6usd22
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8672c40439c..662268c6227 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -252,3 +252,5 @@ $remove_color: $icon_close
         width: 80%
     .oe_remove
         color: $remove_color
+    .oe_seo_suggestion
+        cursor: pointer
-- 
cgit v1.2.3


From 653ad4de24c62ba12b0f21e310f933b8f1166647 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 3 Sep 2013 16:51:32 +0200
Subject: SEO refactoring

bzr revid: ddm@openerp.com-20130903145132-5uppe457x0x19a42
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 662268c6227..321cc2b3501 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -253,4 +253,4 @@ $remove_color: $icon_close
     .oe_remove
         color: $remove_color
     .oe_seo_suggestion
-        cursor: pointer
+        cursor: pointer
\ No newline at end of file
-- 
cgit v1.2.3


From 7704ce7e03b0fb6d27f24873739190a10086d26d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 4 Sep 2013 10:49:58 +0200
Subject: [IMP] website_sale: add product in website

bzr revid: chm@openerp.com-20130904084958-6rq5xu0xjwzcv399
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 321cc2b3501..dd6e2f29146 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -58,6 +58,9 @@
 .oe_editable:focus
     outline: none !important
 
+.css_non_editable_mode_hidden:
+    display: none
+
 .oe_carousel_options
     cursor: pointer
     position: absolute
-- 
cgit v1.2.3


From 20e0db456f005faf165e5dfa44bfb0f567e7e44e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 4 Sep 2013 16:01:38 +0200
Subject: [IMP] wwebsite: add option background and style in snippets carousel

bzr revid: chm@openerp.com-20130904140138-tvt640suoiln13fx
---
 addons/website/static/src/css/editor.sass | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index dd6e2f29146..e68ce289526 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -67,6 +67,11 @@
     white-space: nowrap
     z-index: 1
     display: none
+    > *
+        display: inline-block !important
+        vertical-align: middle !important
+        position: relative !important
+        top: +2px;
 
 /* ---- SNIPPET EDITOR ---- */
 
-- 
cgit v1.2.3


From c68f584988f7ebf35f430b1b4d6e2f5e627343f1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 5 Sep 2013 10:20:42 +0200
Subject: [FIX] website: sass & css

bzr revid: chm@openerp.com-20130905082042-6n359n6ot5wntk0k
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e68ce289526..ec009b64ec2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -58,7 +58,7 @@
 .oe_editable:focus
     outline: none !important
 
-.css_non_editable_mode_hidden:
+.css_non_editable_mode_hidden
     display: none
 
 .oe_carousel_options
@@ -71,7 +71,7 @@
         display: inline-block !important
         vertical-align: middle !important
         position: relative !important
-        top: +2px;
+        top: +2px
 
 /* ---- SNIPPET EDITOR ---- */
 
-- 
cgit v1.2.3


From e56953d94e71854ed57540743a6a00e6ceafe9ba Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 6 Sep 2013 10:50:45 +0200
Subject: [ADD] new table-creation button

bzr revid: xmo@openerp.com-20130906085045-zpemzy2akh3bz7q3
---
 addons/website/static/src/css/editor.sass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ec009b64ec2..4897ff0c004 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -21,11 +21,10 @@
     position: fixed
     top: 0
     right: 0
-    z-index: 10
     display: block
     width: 100%
     padding: 2px
-    margin: 0px
+    margin: 0
     z-index: 10000
     background-color: #414141
     background: -webkit-linear-gradient(#646060, #262626)
@@ -73,6 +72,14 @@
         position: relative !important
         top: +2px
 
+/* ---- EDITOR BAR ---- */
+
+table.editorbar-panel
+    cursor: pointer
+    width: 100%
+    td.selected
+        background-color: #b1c9d9
+
 /* ---- SNIPPET EDITOR ---- */
 
 .oe_snippets
@@ -261,4 +268,4 @@ $remove_color: $icon_close
     .oe_remove
         color: $remove_color
     .oe_seo_suggestion
-        cursor: pointer
\ No newline at end of file
+        cursor: pointer
-- 
cgit v1.2.3


From 76409db72424734484acde5057cfa92d78ba899f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 6 Sep 2013 12:16:58 +0200
Subject: [FIX] bootstrap makes buttons unselectable, which breaks RTE. Revert
 behavior when button in section being edited

bzr revid: xmo@openerp.com-20130906101658-m35uqghtvi3kd7bc
---
 addons/website/static/src/css/editor.sass | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4897ff0c004..2da2b4bbeeb 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -80,6 +80,17 @@ table.editorbar-panel
     td.selected
         background-color: #b1c9d9
 
+/* ---- RTE ---- */
+
+// bootstrap makes .btn elements unselectable -> RTE double-click can't know
+// about them either
+.oe_editable .btn
+    -webkit-user-select: auto
+    -moz-user-select: auto
+    -ms-user-select: auto
+    -o-user-select: auto
+    user-select: auto
+
 /* ---- SNIPPET EDITOR ---- */
 
 .oe_snippets
-- 
cgit v1.2.3


From d97d58f5db12f17b723bc9f1cb71b924470efc11 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 8 Sep 2013 23:01:39 +0200
Subject: [IMP] structure in snippets

bzr revid: fp@openerp.com-20130908210139-3wsl86ij3yd5udqz
---
 addons/website/static/src/css/editor.sass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 2da2b4bbeeb..135523cc1c2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -98,12 +98,15 @@ table.editorbar-panel
     left: 0px
     right: 0px
     bottom: 0px
-    max-height: 280px
-    min-height: 140px
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
     z-index: 100
+    .nav-pills
+        padding: 3px 8px
+        background: #444
+        > li > a
+            padding: 2px 10px !important
 
 .oe_snippet
     display: inline-block
@@ -112,10 +115,10 @@ table.editorbar-panel
     width: 120px
     height: 120px
     border-radius: 3px
-    margin: 10px
+    margin: 8px
     margin-right: 0px
     position: relative
-    box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
+    box-shadow: 0px 3px 8px rgba(0,0,0,0.2)
     overflow: hidden
     -webkit-user-select: none
     user-select: none
-- 
cgit v1.2.3


From 0b199c50e5ee2a85a4a4826b033fecc013bb0e70 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 9 Sep 2013 15:28:00 +0200
Subject: [WIP] website: snippets: box snippet widget with resize options on
 click

bzr revid: chm@openerp.com-20130909132800-au0lgkf8thirsv8r
---
 addons/website/static/src/css/editor.sass | 33 +++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 09d3ef51dee..e982fcc5ac0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -117,6 +117,8 @@
         display: none
     & > *
         pointer-events: none
+    & > :not(.oe_snippet_body):not(.oe_snippet_thumbnail)
+        display: none !important
 
     & > *:first-child:not(.oe_snippet_thumbnail)
         display: block
@@ -174,22 +176,21 @@
     opacity: 0
     transition: opacity 100ms linear
     box-sizing: border-box
-    & > .oe_handle
+    pointer-events: none
+    .oe_handle
         display: none
     &.oe_hover
         opacity: 1
         cursor: pointer
-    &.oe_selected
+    &.oe_selected, &.oe_active
         opacity: 1
-        pointer-events: none
         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
         & > *
             pointer-events: auto
-        & > .oe_handle
-            display: block
     .oe_buttons
+        display: none
         position: absolute
         right: 16px
         top: 16px
@@ -201,6 +202,10 @@
             display: inline-block
             padding: 8px
             cursor: pointer
+    &.oe_active
+        z-index: 100000
+        .oe_handle, .oe_buttons
+            display: block
 
 .oe_handle
     pointer-events: auto
@@ -215,7 +220,6 @@
     width: 16px
     height: 16px
     margin: -8px
-    cursor: move
     -webkit-transition: background 100ms linear
     &:hover
         background: rgb(153, 0, 255)
@@ -230,6 +234,23 @@
     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 ---- */
 
-- 
cgit v1.2.3


From 7bcc4f4d1dcaa245ff23cefb9a3e4acbeadfd72a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 9 Sep 2013 16:49:40 +0200
Subject: [WIP] website: snippets: work

bzr revid: chm@openerp.com-20130909144940-f08v6egk5pijz29b
---
 addons/website/static/src/css/editor.sass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e982fcc5ac0..ea6bfeeab34 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -177,17 +177,20 @@
     transition: opacity 100ms linear
     box-sizing: border-box
     pointer-events: none
+    .oe_boxsize, .oe_margin
+        position: absolute
+        pointer-events: none
     .oe_handle
         display: none
     &.oe_hover
         opacity: 1
         cursor: pointer
-    &.oe_selected, &.oe_active
+    &.oe_selected, &.oe_active, .oe_boxsize, .oe_margin
         opacity: 1
         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
-- 
cgit v1.2.3


From 7c45e5976e6caf3d7b9eb508f728062704232261 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 9 Sep 2013 23:46:26 +0200
Subject: CMS basic view editing

bzr revid: ddm@openerp.com-20130909214626-51zfydwbw624heqz
---
 addons/website/static/src/css/editor.sass | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 2da2b4bbeeb..f2af11186e2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -280,3 +280,22 @@ $remove_color: $icon_close
         color: $remove_color
     .oe_seo_suggestion
         cursor: pointer
+
+/* ---- ACE EDITOR ---- */
+
+.oe_ace_view_editor
+    position: fixed
+    top: 51px
+    right: 0px
+    width: 50%
+    height: 100%
+    z-index: 1000
+    .oe_ace_view_editor_title
+        height: 36px
+        background-color: #111
+    .ace_editor
+        position: absolute
+        top: 36px
+        right: 0
+        bottom: 0
+        left: 0
-- 
cgit v1.2.3


From d37594fab32e7df0e210a890250d29468969d42a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 08:39:38 +0200
Subject: [FIX] View save now working

bzr revid: ddm@openerp.com-20130910063938-yh6tje9h5y9i0ld6
---
 addons/website/static/src/css/editor.sass | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f2af11186e2..68c0287a14f 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -287,15 +287,24 @@ $remove_color: $icon_close
     position: fixed
     top: 51px
     right: 0px
-    width: 50%
     height: 100%
     z-index: 1000
     .oe_ace_view_editor_title
-        height: 36px
+        width: 100%
+        padding-left: 2px
+        height: 3em
         background-color: #111
+        .oe_view_list
+            width: 50%
     .ace_editor
         position: absolute
-        top: 36px
+        top: 3em
         right: 0
         bottom: 0
         left: 0
+
+.oe_ace_closed
+    width: 15px
+
+.oe_ace_open
+    width: 50%
-- 
cgit v1.2.3


From 6a245e471ec64cf0e75fa6a324734aae8e805747 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 08:46:34 +0200
Subject: [IMP] Basic animation

bzr revid: ddm@openerp.com-20130910064634-uz51lsczdxqw3fum
---
 addons/website/static/src/css/editor.sass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 68c0287a14f..8d250d00370 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -304,7 +304,9 @@ $remove_color: $icon_close
         left: 0
 
 .oe_ace_closed
-    width: 15px
+    width: 0
+    transition: width 0.4s ease-in
 
 .oe_ace_open
     width: 50%
+    transition: width 0.4s ease-in
-- 
cgit v1.2.3


From a109098cb782aa8d44d4091035e6707b4161a70d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 12:01:27 +0200
Subject: [FIX] Proper editor sizing

bzr revid: ddm@openerp.com-20130910100127-98zjbitry2xhqld2
---
 addons/website/static/src/css/editor.sass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8d250d00370..93566cf16c0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -302,11 +302,12 @@ $remove_color: $icon_close
         right: 0
         bottom: 0
         left: 0
+        width: 720px
 
 .oe_ace_closed
     width: 0
     transition: width 0.4s ease-in
 
 .oe_ace_open
-    width: 50%
+    width: 720px
     transition: width 0.4s ease-in
-- 
cgit v1.2.3


From 3ee7b343dc61fdfd80fcfc56df11616ee95c46dd Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 13:24:39 +0200
Subject: [FIX] Ace editor size

bzr revid: ddm@openerp.com-20130910112439-0d5aoddbxa29asf6
---
 addons/website/static/src/css/editor.sass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 2ce32a8a6bb..e4edcd3c62e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -333,21 +333,21 @@ $remove_color: $icon_close
 .oe_ace_view_editor
     position: fixed
     top: 51px
-    right: 0px
-    height: 100%
+    right: 0
     z-index: 1000
+    height: 100%
     .oe_ace_view_editor_title
         width: 100%
         padding-left: 2px
-        height: 3em
+        height: 34px
         background-color: #111
         .oe_view_list
             width: 50%
     .ace_editor
         position: absolute
-        top: 3em
+        top: 34px
         right: 0
-        bottom: 0
+        bottom: 51px
         left: 0
         width: 720px
 
-- 
cgit v1.2.3


From f80717d3e52838b3142c783e587b7383ef7fc78d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Sep 2013 17:40:24 +0200
Subject: [UNDO] revert change as snippets moved to client side

bzr revid: fp@tinyerp.com-20130910154024-qc1h6ha7hmocu2fj
---
 addons/website/static/src/css/editor.sass | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8c32d4222f5..e4edcd3c62e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -98,15 +98,12 @@ table.editorbar-panel
     left: 0px
     right: 0px
     bottom: 0px
+    max-height: 280px
+    min-height: 140px
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
     z-index: 100
-    .nav-pills
-        padding: 3px 8px
-        background: #444
-        > li > a
-            padding: 2px 10px !important
 
 .oe_snippet
     display: inline-block
@@ -115,10 +112,10 @@ table.editorbar-panel
     width: 120px
     height: 120px
     border-radius: 3px
-    margin: 8px
+    margin: 10px
     margin-right: 0px
     position: relative
-    box-shadow: 0px 3px 8px rgba(0,0,0,0.2)
+    box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
     overflow: hidden
     -webkit-user-select: none
     user-select: none
-- 
cgit v1.2.3


From b3898c8d234564da5813c6e8007613d42704d8fc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Sep 2013 14:56:32 +0200
Subject: [IMP] website: snippet editor and building block

bzr revid: chm@openerp.com-20130911125632-ekcxa8b4lu5ml4eq
---
 addons/website/static/src/css/editor.sass | 110 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 54 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 289ab1e6e54..431bed0c1c8 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -93,7 +93,7 @@ table.editorbar-panel
 
 /* ---- SNIPPET EDITOR ---- */
 
-.oe_snippets
+#oe_snippets
     position: fixed
     left: 0px
     right: 0px
@@ -182,11 +182,11 @@ table.editorbar-panel
     border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
-        z-index: 99
+        z-index: 97
 
 /* ---- SNIPPET MANIPULATOR ---- */
 
-.oe_snippet_manipulator
+.oe_overlay
     display: block
     position: absolute
     background: transparent //rgba(153, 0, 255, 0.05)
@@ -195,38 +195,41 @@ table.editorbar-panel
     transition: opacity 100ms linear
     box-sizing: border-box
     pointer-events: none
-    .oe_boxsize, .oe_margin
-        position: absolute
-        pointer-events: none
     .oe_handle
-        display: none
+        display: none !important
     &.oe_hover
         opacity: 1
         cursor: pointer
-    &.oe_selected, &.oe_active, .oe_boxsize, .oe_margin
+    &.oe_selected, &.oe_active
         opacity: 1
         background: transparent
-        border: dashed 1px rgba(153, 0, 255, 0.5)
+        border-style: dashed
+        border-width: 1px
         box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
+    &.oe_selected
+        border-color: rgba(0, 153, 255, 0.5)
+    &.oe_active
+        border-color: rgba(153, 0, 255, 0.5)
         .oe_handle
+            display: block !important
             pointer-events: auto
-    .oe_buttons
+
+    .oe_overlay_options
         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
+        z-index: 99
+        .oe_option
+            pointer-events: auto
+            position: absolute
+            &.n
+                top: 0px
+            &.e
+                right: 0px
+            &.s
+                bottom: 0px
+            &.w
+                left: 0px
+    &.oe_active .oe_overlay_options
+        display: block
 
 .oe_handle
     pointer-events: auto
@@ -234,43 +237,42 @@ table.editorbar-panel
     top: 50%
     left: 50%
     display: block
-    background: rgba(255, 255, 255, 1)
-    border: solid 1px rgba(153, 0, 255, 1)
     box-sizing: border-box
-    border-radius: 8px
-    width: 16px
-    height: 16px
-    margin: -8px
-    -webkit-transition: background 100ms linear
-    &:hover
-        background: rgb(153, 0, 255)
-
-.oe_handle.nw,.oe_handle.n,.oe_handle.ne
+    width: 8px
+    height: 8px
+    margin: -4px
+
+.oe_handle.n
+    left: 2px
+    width: 100%
     top: 0px
-.oe_handle.ne,.oe_handle.e,.oe_handle.se
+    cursor: s-resize
+.oe_handle.e
     left: auto
+    top: 2px
+    height: 100%
     right: 0px
-.oe_handle.sw,.oe_handle.s,.oe_handle.se
+    cursor: w-resize
+.oe_handle.s
     top: auto
+    left: 2px
+    width: 100%
     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
+    top: 2px
+    height: 100%
+    left: 0px
+    cursor: e-resize
+
+.s-resize-important, .s-resize-important *
+    cursor: s-resize !important
+.n-resize-important, .n-resize-important *
+    cursor: n-resize !important
+.e-resize-important, .e-resize-important *
+    cursor: e-resize !important
+.w-resize-important, .w-resize-important *
+    cursor: w-resize !important
 
 
 /* ---- MOBILE PREVIEW ---- */
-- 
cgit v1.2.3


From 134c0899541f036d38885c76771c4a55650a4a5d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 11 Sep 2013 15:26:18 +0200
Subject: [FIX] Proper template filtering + various

bzr revid: ddm@openerp.com-20130911132618-9n599qmiyj3k934p
---
 addons/website/static/src/css/editor.sass | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f9774ed296f..82a5adee94d 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -332,31 +332,40 @@ $remove_color: $icon_close
 
 /* ---- ACE EDITOR ---- */
 
+$ace_width: 720px
+$editorbar_height: 34px
+// TODO Fix => might break with themes
+$navbar_height: 51px
+
 .oe_ace_view_editor
     position: fixed
-    top: 51px
+    top: $navbar_height
     right: 0
     z-index: 1000
     height: 100%
     .oe_ace_view_editor_title
         width: 100%
         padding-left: 2px
-        height: 34px
+        height: $editorbar_height
         background-color: #111
         .oe_view_list
             width: 50%
+            height: $editorbar_height
+        .btn
+            height: $editorbar_height
+            padding: 0 4px 0 4px
     .ace_editor
         position: absolute
-        top: 34px
+        top: $editorbar_height
         right: 0
-        bottom: 51px
+        bottom: $navbar_height
         left: 0
-        width: 720px
+        width: $ace_width
 
 .oe_ace_closed
     width: 0
     transition: width 0.4s ease-in
 
 .oe_ace_open
-    width: 720px
+    width: $ace_width
     transition: width 0.4s ease-in
-- 
cgit v1.2.3


From 79cc608e57c1e8b686589ea1c9470a1a1344a17b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Sep 2013 17:20:00 +0200
Subject: [IMP] website: snippet editor: add pill and group by category; fix
 overlay

bzr revid: chm@openerp.com-20130911152000-lzt62hinncodcnoc
---
 addons/website/static/src/css/editor.sass | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 82a5adee94d..c1f4d578b98 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -104,6 +104,13 @@ table.editorbar-panel
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
     z-index: 100
+    .nav-pills
+        padding: 3px 8px
+        background: #444444
+        > li > a
+            padding: 2px 10px !important
+    .pill-content
+        height: 140px
 
 .oe_snippet
     display: inline-block
-- 
cgit v1.2.3


From 1bcae6b62fed65ea5b2797533e3a8bac41760dcb Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 11 Sep 2013 17:45:02 +0200
Subject: [IMP] CSS transparency support

bzr revid: ddm@openerp.com-20130911154502-r2493m71f2x8vvdl
---
 addons/website/static/src/css/editor.sass | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c1f4d578b98..7230a14b695 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -340,11 +340,13 @@ $remove_color: $icon_close
 /* ---- ACE EDITOR ---- */
 
 $ace_width: 720px
-$editorbar_height: 34px
+$editorbar_height: 40px
 // TODO Fix => might break with themes
 $navbar_height: 51px
 
 .oe_ace_view_editor
+    transition: all 0.2s ease-in
+    opacity: 0.3
     position: fixed
     top: $navbar_height
     right: 0
@@ -352,14 +354,15 @@ $navbar_height: 51px
     height: 100%
     .oe_ace_view_editor_title
         width: 100%
-        padding-left: 2px
+        padding-top: 4px
+        padding-left: 4px
         height: $editorbar_height
-        background-color: #111
+        background: #2F3129
         .oe_view_list
             width: 50%
-            height: $editorbar_height
+            height: $editorbar_height - 8px
         .btn
-            height: $editorbar_height
+            height: $editorbar_height - 8px
             padding: 0 4px 0 4px
     .ace_editor
         position: absolute
@@ -368,11 +371,10 @@ $navbar_height: 51px
         bottom: $navbar_height
         left: 0
         width: $ace_width
-
-.oe_ace_closed
-    width: 0
-    transition: width 0.4s ease-in
-
-.oe_ace_open
-    width: $ace_width
-    transition: width 0.4s ease-in
+    &:hover
+        opacity: 1
+    &.oe_ace_open
+        width: $ace_width
+    &.oe_ace_closed
+        width: 0
+        opacity: 0
-- 
cgit v1.2.3


From 62fff458c57c85cf701d83840f8b85d13e33788c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Sep 2013 11:15:36 +0200
Subject: [IMP] tabify link dialog for simpler layout

bzr revid: xmo@openerp.com-20130912091536-mx8dre2qyiz00h36
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7230a14b695..81e7e6c660a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -74,6 +74,9 @@
 
 /* ---- EDITOR BAR ---- */
 
+.modal .tab-content
+    padding-top: 5px
+
 table.editorbar-panel
     cursor: pointer
     width: 100%
-- 
cgit v1.2.3


From d124389fa314e57cb27d27ed4fe242322c597c6f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Sep 2013 12:37:52 +0200
Subject: [IMP] tabified image picker dialog

bzr revid: xmo@openerp.com-20130912103752-sg9jmba0b061f7x9
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 81e7e6c660a..7f9f646f054 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -83,6 +83,9 @@ table.editorbar-panel
     td.selected
         background-color: #b1c9d9
 
+.modal .image-preview
+    margin-bottom: 0.5em
+
 /* ---- RTE ---- */
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
-- 
cgit v1.2.3


From 75977b4e43026d21ce691f30c0df1043485d83fe Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Sep 2013 13:29:05 +0200
Subject: [ADD] selection of image style in dialog

bzr revid: xmo@openerp.com-20130912112905-6skmq1umsyzcvthz
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7f9f646f054..3c1fe6a47f5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -83,7 +83,7 @@ table.editorbar-panel
     td.selected
         background-color: #b1c9d9
 
-.modal .image-preview
+.modal .image-preview-container, .modal .image-preview
     margin-bottom: 0.5em
 
 /* ---- RTE ---- */
-- 
cgit v1.2.3


From e45e3c22f6e0fdd8f76b9462eef2dfea24091a4d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Sep 2013 16:53:02 +0200
Subject: [IMP] website: layout options

bzr revid: chm@openerp.com-20130912145302-39eme37759sjm3rv
---
 addons/website/static/src/css/editor.sass | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3c1fe6a47f5..d3a58c91a13 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -25,7 +25,7 @@
     width: 100%
     padding: 2px
     margin: 0
-    z-index: 10000
+    z-index: 20000
     background-color: #414141
     background: -webkit-linear-gradient(#646060, #262626)
     box-sizing: border-box
@@ -109,7 +109,7 @@ table.editorbar-panel
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
-    z-index: 100
+    z-index: 20000
     .nav-pills
         padding: 3px 8px
         background: #444444
@@ -195,7 +195,7 @@ table.editorbar-panel
     border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
-        z-index: 97
+        z-index: 1001
 
 /* ---- SNIPPET MANIPULATOR ---- */
 
@@ -229,18 +229,27 @@ table.editorbar-panel
 
     .oe_overlay_options
         display: none
-        z-index: 99
+        z-index: 1002
         .oe_option
+            top: 50%
+            left: 50%
             pointer-events: auto
             position: absolute
+            display: block
+            z-index: 1002
             &.n
-                top: 0px
+                top: -11px
             &.e
-                right: 0px
+                left: auto
+                right: -6px
             &.s
-                bottom: 0px
+                top: auto
+                bottom: -10px
             &.w
-                left: 0px
+                left: -6px
+            > a
+                text-decoration: none
+                font-size: 1.2em
     &.oe_active .oe_overlay_options
         display: block
 
-- 
cgit v1.2.3


From a793a8ff16cec0466a073e9cd9cf40e8fd8116ad Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 10:40:13 +0200
Subject: [REV] tabification of link and image dialogs

bzr revid: xmo@openerp.com-20130913084013-19zu9k9voxplwwhp
---
 addons/website/static/src/css/editor.sass | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d3a58c91a13..059f9eedb45 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -74,18 +74,12 @@
 
 /* ---- EDITOR BAR ---- */
 
-.modal .tab-content
-    padding-top: 5px
-
 table.editorbar-panel
     cursor: pointer
     width: 100%
     td.selected
         background-color: #b1c9d9
 
-.modal .image-preview-container, .modal .image-preview
-    margin-bottom: 0.5em
-
 /* ---- RTE ---- */
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
-- 
cgit v1.2.3


From cf7984b656fbcd39081554c6276a706f7c454c92 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 11:35:18 +0200
Subject: [IMP] website editor snippets: move and add label

bzr revid: chm@openerp.com-20130913093518-kzla5hif1o1ubii5
---
 addons/website/static/src/css/editor.sass | 42 +++++++++++++++++--------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 059f9eedb45..96c77108ff6 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -202,8 +202,6 @@ table.editorbar-panel
     transition: opacity 100ms linear
     box-sizing: border-box
     pointer-events: none
-    .oe_handle
-        display: none !important
     &.oe_hover
         opacity: 1
         cursor: pointer
@@ -215,35 +213,39 @@ table.editorbar-panel
         box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
     &.oe_selected
         border-color: rgba(0, 153, 255, 0.5)
+    .oe_handle
+        display: none !important
     &.oe_active
         border-color: rgba(153, 0, 255, 0.5)
         .oe_handle
             display: block !important
             pointer-events: auto
+    .icon.btn
+        display: inline-block
 
     .oe_overlay_options
         display: none
         z-index: 1002
-        .oe_option
-            top: 50%
-            left: 50%
-            pointer-events: auto
+        .oe_options,.oe_label,.oe_move
             position: absolute
             display: block
             z-index: 1002
-            &.n
-                top: -11px
-            &.e
-                left: auto
-                right: -6px
-            &.s
-                top: auto
-                bottom: -10px
-            &.w
-                left: -6px
-            > a
-                text-decoration: none
-                font-size: 1.2em
+            top: -11px
+        .oe_options
+            pointer-events: auto
+            left: -14px
+        .oe_label
+            top: -8px
+            right: 6px
+            background: #fff
+            font-size: 75%
+            color: rgba(153, 0, 255, 0.5)
+            padding: 0 5px
+        .oe_move
+            pointer-events: auto
+            left: 50%
+            .js_box_move
+                margin-left: -50%
     &.oe_active .oe_overlay_options
         display: block
 
@@ -289,6 +291,8 @@ table.editorbar-panel
     cursor: e-resize !important
 .w-resize-important, .w-resize-important *
     cursor: w-resize !important
+.move-important, .move-important *
+    cursor: move !important
 
 
 /* ---- MOBILE PREVIEW ---- */
-- 
cgit v1.2.3


From 5086f1e1e13a06d9250ff28e5bf48dbe8cbd0a8a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 12:19:11 +0200
Subject: [IMP] website editor snippet: vertical selector (eg.: used for drag
 and drop column)

bzr revid: chm@openerp.com-20130913101911-467bx9ddykv23ae6
---
 addons/website/static/src/css/editor.sass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 96c77108ff6..e19757db49c 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -178,8 +178,12 @@ table.editorbar-panel
         top: 24px
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
-
-.oe_drop_zone.oe_overlay
+    &.oe_vertical
+        width: 16px
+        display: inline-block
+        position: absolute
+        margin: 0px !important
+    &.oe_overlay
     position: absolute
     background: rgba(153, 0, 255, 0.17)
     border-radius: 3px
-- 
cgit v1.2.3


From 6f68c76f99d1d1568d6bc235f1e857c7f742b01c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 12:26:53 +0200
Subject: [FIX] website editor snippet: vertical selector css to display

bzr revid: chm@openerp.com-20130913102653-pb6d8oyrf9xhodg8
---
 addons/website/static/src/css/editor.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e19757db49c..65179d365fe 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -160,6 +160,7 @@ table.editorbar-panel
     height: 32px
     margin: -16px 0px
     -webkit-transition: margin 250ms linear
+    width: 100%
     &:first-child:not(:last-child)
         margin-top: -8px
         margin-bottom: -24px
-- 
cgit v1.2.3


From d05c5a27830ad83a83687c354463365942b09945 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 12:28:03 +0200
Subject: [IMP] website editor snippet: vertical selector css z-index

bzr revid: chm@openerp.com-20130913102803-hhs46m43v2mbjsbf
---
 addons/website/static/src/css/editor.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 65179d365fe..380564b0cec 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -161,6 +161,7 @@ table.editorbar-panel
     margin: -16px 0px
     -webkit-transition: margin 250ms linear
     width: 100%
+    z-index: 1000
     &:first-child:not(:last-child)
         margin-top: -8px
         margin-bottom: -24px
-- 
cgit v1.2.3


From f16b61cbe61a77cf331a54ea11520322e7730739 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 13:41:43 +0200
Subject: [ADD] separate attachment dialog selector

bzr revid: xmo@openerp.com-20130913114143-v799fvf08rpiox3r
---
 addons/website/static/src/css/editor.sass | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 96c77108ff6..1dd71acefdc 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -91,6 +91,27 @@ table.editorbar-panel
     -o-user-select: auto
     user-select: auto
 
+.modal .existing-attachments a.thumbnail
+    position: relative
+
+    &.selected:before
+        text-decoration: none
+        font-size: 150%
+        background-color: rgba(0, 0, 0, 0.3)
+        color: #21dc0f
+        content: "✔"
+
+        height: 2em
+        width: 2em
+        text-align: center
+        padding: 5px
+        border-radius: 4px 0
+
+        position: absolute
+        top: 0
+        left: 0
+
+
 /* ---- SNIPPET EDITOR ---- */
 
 #oe_snippets
-- 
cgit v1.2.3


From 74678c7632b7506d360e8a36990136a0dad7d434 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 13:44:56 +0200
Subject: [IMP] website editor snippet: image-text, text-imge, carousel

bzr revid: chm@openerp.com-20130913114456-sacksn4frv2w9re1
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 380564b0cec..3dc35b77a85 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -252,6 +252,8 @@ table.editorbar-panel
             left: 50%
             .js_box_move
                 margin-left: -50%
+        .dropdown-menu select,.dropdown-menu input
+            display: block
     &.oe_active .oe_overlay_options
         display: block
 
-- 
cgit v1.2.3


From 9cba34b53884a1cc684c7a25a8a42645fb97190e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 13 Sep 2013 15:05:50 +0200
Subject: [FIX] Ace CSS prefixes

bzr revid: ddm@openerp.com-20130913130550-neezqclp4a9ti78l
---
 addons/website/static/src/css/editor.sass | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3dc35b77a85..81e82361d13 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -367,6 +367,10 @@ $navbar_height: 51px
 
 .oe_ace_view_editor
     transition: all 0.2s ease-in
+    -webkit-transition: all 0.2s ease-in
+    -ms-transition: all 0.2s ease-in
+    -o-transition: all 0.2s ease-in
+    -moz-transition: all 0.2s ease-in
     opacity: 0.3
     position: fixed
     top: $navbar_height
-- 
cgit v1.2.3


From 972f5029428a9b7fe023ef0ed08d462589e5594c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 17:23:08 +0200
Subject: [ADD] reintroduce image style selector

bzr revid: xmo@openerp.com-20130913152308-j250t5ns7iaz6w2n
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 9b6bf982116..14c0c58ede3 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -111,6 +111,8 @@ table.editorbar-panel
         top: 0
         left: 0
 
+.modal .image-preview
+    margin-bottom: 0.5em
 
 /* ---- SNIPPET EDITOR ---- */
 
-- 
cgit v1.2.3


From b7f3383c3c4aef93b6d339a6c8197ce0646d23fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 00:13:01 +0200
Subject: [IMP] title node selection

bzr revid: fp@openerp.com-20130914221301-gnt115hzjv61slpe
---
 addons/website/static/src/css/editor.sass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 14c0c58ede3..28230889ab0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -209,9 +209,9 @@ table.editorbar-panel
         position: absolute
         margin: 0px !important
     &.oe_overlay
-    position: absolute
-    background: rgba(153, 0, 255, 0.17)
-    border-radius: 3px
+        position: absolute
+        background: rgba(153, 0, 255, 0.17)
+        border-radius: 3px
 
 .oe_drop_zone
     background: rgba(153, 0, 255, 0.17)
-- 
cgit v1.2.3


From bab696f0d958acba37c9b023bc760c36b2283677 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 10:25:33 +0200
Subject: [FIX] website: snippets

bzr revid: chm@openerp.com-20130916082533-f0jaa7jaiz8swc9l
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 28230889ab0..008c052930a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -184,6 +184,7 @@ table.editorbar-panel
     margin: -16px 0px
     -webkit-transition: margin 250ms linear
     width: 100%
+    position: absolute
     z-index: 1000
     &:first-child:not(:last-child)
         margin-top: -8px
@@ -209,7 +210,6 @@ table.editorbar-panel
         position: absolute
         margin: 0px !important
     &.oe_overlay
-        position: absolute
         background: rgba(153, 0, 255, 0.17)
         border-radius: 3px
 
-- 
cgit v1.2.3


From ef0d17312108a18a5a529e1b9140ede5f3b9d890 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 13:28:34 +0200
Subject: [IMP] website snippet: snippet list on top and open per default. hide
 when drag and drop

bzr revid: chm@openerp.com-20130916112834-5wj11850ehimxkco
---
 addons/website/static/src/css/editor.sass | 32 +++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 008c052930a..308a3a6b017 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -120,13 +120,13 @@ table.editorbar-panel
     position: fixed
     left: 0px
     right: 0px
-    bottom: 0px
+    top: 50px
     max-height: 280px
     min-height: 140px
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
-    z-index: 20000
+    z-index: 1010
     .nav-pills
         padding: 3px 8px
         background: #444444
@@ -249,6 +249,34 @@ table.editorbar-panel
         .oe_handle
             display: block !important
             pointer-events: auto
+            &:before
+                position: relative
+                top: 50%
+                left: 50%
+                display: block
+                background: rgba(255, 255, 255, 1)
+                border: solid 1px rgba(153, 0, 255, 1)
+                border-radius: 8px
+                width: 16px
+                height: 16px
+                margin: -8px
+                padding-left: 1px
+                font-size: 14px
+                line-height: 14px
+                color: rgba(153, 0, 255, 1)
+                -webkit-transition: background 100ms linear
+            &:hover:before
+                background: rgba(153, 0, 255, 1)
+                color: #fff
+        .oe_handle.e:before
+            content: "⇨"
+        .oe_handle.s:before
+            content: "⇩"
+        .oe_handle.w:before
+            content: "⇦"
+        .oe_handle.n:before
+            content: "⇧"
+
     .icon.btn
         display: inline-block
 
-- 
cgit v1.2.3


From 00a4fe922942dc89a542f22ee4f52d3406e33b4f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 13:51:48 +0200
Subject: [IMP] website: snippet: css auto hide

bzr revid: chm@openerp.com-20130916115148-wx6a1ux1iq0dupyg
---
 addons/website/static/src/css/editor.sass | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 308a3a6b017..58801bed5f4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -116,7 +116,9 @@ table.editorbar-panel
 
 /* ---- SNIPPET EDITOR ---- */
 
+
 #oe_snippets
+    display: none
     position: fixed
     left: 0px
     right: 0px
@@ -135,6 +137,9 @@ table.editorbar-panel
     .pill-content
         height: 140px
 
+#website-top-navbar:hover #oe_snippets
+    display: block
+
 .oe_snippet
     display: inline-block
     vertical-align: top
-- 
cgit v1.2.3


From b6022c5724dad47a8b1635d5830561634d3af279 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 14:29:42 +0200
Subject: [FIX] website: snippet content; + add method dom_filter instead of
 change selector

bzr revid: chm@openerp.com-20130916122942-szdvqcg4tszrgeo3
---
 addons/website/static/src/css/editor.sass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 58801bed5f4..b4994050bab 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -230,7 +230,7 @@ table.editorbar-panel
 .oe_overlay
     display: block
     position: absolute
-    background: transparent //rgba(153, 0, 255, 0.05)
+    background: transparent
     border-radius: 3px
     opacity: 0
     transition: opacity 100ms linear
@@ -241,7 +241,6 @@ table.editorbar-panel
         cursor: pointer
     &.oe_selected, &.oe_active
         opacity: 1
-        background: transparent
         border-style: dashed
         border-width: 1px
         box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
-- 
cgit v1.2.3


From 24a63ccea7bb9f2cf65afffcccd7c41fe3b91cc9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 16:42:35 +0200
Subject: [IMP] website snippet: add button 'insert block' on top bar

bzr revid: chm@openerp.com-20130916144235-mxm63fikqlf0jv8s
---
 addons/website/static/src/css/editor.sass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index b4994050bab..3c8511450ed 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -137,9 +137,6 @@ table.editorbar-panel
     .pill-content
         height: 140px
 
-#website-top-navbar:hover #oe_snippets
-    display: block
-
 .oe_snippet
     display: inline-block
     vertical-align: top
-- 
cgit v1.2.3


From 4934343f94c414c475eec89200599a6155a1617a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Sep 2013 15:13:17 +0200
Subject: [IMP] hide drag and drop handler of ckdeditor widgets

bzr revid: xmo@openerp.com-20130917131317-tm7jhawdsq9nvvtp
---
 addons/website/static/src/css/editor.sass | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3dc35b77a85..597804812f1 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -91,6 +91,10 @@ table.editorbar-panel
     -o-user-select: auto
     user-select: auto
 
+// "remove" drag & drop of CKE widgets
+.cke_widget_drag_handler_container
+    display: none !important
+
 /* ---- SNIPPET EDITOR ---- */
 
 #oe_snippets
-- 
cgit v1.2.3


From 7b190b1a56c268deea33a10d47573ec02b3828ac Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 15:31:44 +0200
Subject: [IMP] website snippet: preview

bzr revid: chm@openerp.com-20130917133144-jbgre8v0g29kzrdy
---
 addons/website/static/src/css/editor.sass | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3c8511450ed..82bcb8ffd47 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -140,41 +140,36 @@ table.editorbar-panel
 .oe_snippet
     display: inline-block
     vertical-align: top
-    background: white
     width: 120px
     height: 120px
     border-radius: 3px
     margin: 10px
     margin-right: 0px
     position: relative
-    box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
     overflow: hidden
     -webkit-user-select: none
     user-select: none
     cursor: move
+    pointer-events: none
 
     .oe_snippet_thumbnail.oe_label
+        pointer-events: auto
         text-align: center
-        background: rgb(116, 116, 116)
-        background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
         height: 100%
         line-height: 120px
+        background: transparent
         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)
+        position: relative
+        span, div
+            line-height: 18px
+    & > :not(.oe_snippet_thumbnail)
         display: none !important
 
-    & > *:first-child:not(.oe_snippet_thumbnail)
-        display: block
-        -webkit-transform-origin-x: 5px
-        -webkit-transform-origin-y: 10px
-        -webkit-transform: scale(0.095)
+#oe_snippets .oe_snippet_thumbnail.oe_label
+    background: rgb(116, 116, 116)
+    background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
+    box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset
 
 
 /* ---- SNIPPETS DROP ZONES ---- */
-- 
cgit v1.2.3


From 6a48537430250226e5c32f5380eae932f3123d2c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 16:06:54 +0200
Subject: [IMP] website snippet: preview

bzr revid: chm@openerp.com-20130917140654-olvmy3ckaycv18w3
---
 addons/website/static/src/css/editor.sass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 82bcb8ffd47..c488059c3ab 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -152,11 +152,10 @@ table.editorbar-panel
     cursor: move
     pointer-events: none
 
-    .oe_snippet_thumbnail.oe_label
+    .oe_snippet_thumbnail
         pointer-events: auto
         text-align: center
         height: 100%
-        line-height: 120px
         background: transparent
         color: white
         text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95)
@@ -166,7 +165,7 @@ table.editorbar-panel
     & > :not(.oe_snippet_thumbnail)
         display: none !important
 
-#oe_snippets .oe_snippet_thumbnail.oe_label
+#oe_snippets .oe_snippet_thumbnail
     background: rgb(116, 116, 116)
     background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
     box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset
-- 
cgit v1.2.3


From a95f2137789c3315a9dff9130017467e18244e30 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Sep 2013 21:31:46 +0200
Subject: [IMP] snippets by categories, better menu structure

bzr revid: fp@openerp.com-20130917193146-auw1elwdmlk2eb0n
---
 addons/website/static/src/css/editor.sass | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c488059c3ab..ce508ab6bff 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -124,27 +124,25 @@ table.editorbar-panel
     right: 0px
     top: 50px
     max-height: 280px
-    min-height: 140px
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
     z-index: 1010
     .nav-pills
-        padding: 3px 8px
+        padding: 3px 15px
+        width: 162px
         background: #444444
         > li > a
             padding: 2px 10px !important
-    .pill-content
-        height: 140px
 
 .oe_snippet
     display: inline-block
     vertical-align: top
-    width: 120px
-    height: 120px
+    width: 108px
+    height: 108px
     border-radius: 3px
-    margin: 10px
-    margin-right: 0px
+    margin: 1px
+    margin-top: 0px
     position: relative
     overflow: hidden
     -webkit-user-select: none
-- 
cgit v1.2.3


From d282697fdf8c12095c7f757213db6c639199cd85 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Sep 2013 21:58:39 +0200
Subject: [IMP] style editor bar

bzr revid: fp@openerp.com-20130917195839-4lb2nzuwxl507qn7
---
 addons/website/static/src/css/editor.sass | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ce508ab6bff..c5003dc64dc 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -8,6 +8,17 @@
 .navbar.navbar-inverse .cke_inner
     background: transparent
 
+.navbar.navbar-inverse
+    .cke_toolbar
+        position: relative
+        top: 1px
+    .cke_combo_button
+        padding-top: 3px
+        padding-bottom: 3px
+    .cke_button
+        padding-top: 7px
+        padding-bottom: 7px
+
 .navbar.navbar-inverse .cke_top
     background: transparent
     border: none
-- 
cgit v1.2.3


From e29d8959932952d782e7f4fda29adecf04c79141 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Sep 2013 22:04:50 +0200
Subject: [IMP] CSS table-panel more visible

bzr revid: fp@openerp.com-20130917200450-php2dcprphvdit5r
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c5003dc64dc..74802aec87b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -88,6 +88,8 @@
 table.editorbar-panel
     cursor: pointer
     width: 100%
+    td
+        border: 1px solid #aaa
     td.selected
         background-color: #b1c9d9
 
-- 
cgit v1.2.3


From 823cc5549d1333da16749d5957d20e8e1ceb76e2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 18 Sep 2013 17:48:31 +0200
Subject: [IMP] website snippets: horizontal scolling

bzr revid: chm@openerp.com-20130918154831-qiyin8xx07x20qj2
---
 addons/website/static/src/css/editor.sass | 63 +++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 20 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 74802aec87b..3b6e6c088a8 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -131,22 +131,55 @@ table.editorbar-panel
 
 
 #oe_snippets
-    display: none
     position: fixed
     left: 0px
     right: 0px
     top: 50px
-    max-height: 280px
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
-    overflow-y: auto
     z-index: 1010
-    .nav-pills
+    overflow: hidden
+    .scroll
+        white-space: nowrap
+        overflow-y: auto
+    .nav
         padding: 3px 15px
         width: 162px
         background: #444444
-        > li > a
-            padding: 2px 10px !important
+        > li
+            display: block
+            float: none
+            > a
+                padding: 2px 10px !important
+                width: 100%
+                display: block
+        position: fixed
+        z-index: 1
+        height: 108px
+    .pill-content
+        display: inline-block
+        height: 110px
+        white-space: nowrap
+        padding-left: 166px
+        > div
+            display: inline-block
+            label
+                width: 44px
+                height: 100%
+                color: #fff
+                padding-left: 10px
+                div
+                    width: 100px
+                    text-align: center
+                    -webkit-transform: translate(-39px, 44px) rotate(-90deg)
+                    -moz-transform: translate(-39px, 44px) rotate(-90deg)
+                    -o-transform: translate(-39px, 44px) rotate(-90deg)
+                    transform: translate(-39px, 44px) rotate(-90deg)
+                    -webkit-transform-origin: 50% 50%
+                    -moz-transform-origin: 50% 50%
+                    -ms-transform-origin: 50% 50%
+                    -o-transform-origin: 50% 50%
+                    transform-origin: 50% 50%
 
 .oe_snippet
     display: inline-block
@@ -181,34 +214,24 @@ table.editorbar-panel
     background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
     box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset
 
-
 /* ---- SNIPPETS DROP ZONES ---- */
 
 
 .oe_drop_zone.oe_insert
     display: block
-    height: 32px
-    margin: -16px 0px
+    height: 48px
+    margin: 0px
+    margin-bottom: -48px
     -webkit-transition: margin 250ms linear
     width: 100%
     position: absolute
     z-index: 1000
-    &:first-child:not(:last-child)
-        margin-top: -8px
-        margin-bottom: -24px
-    &:last-child:not(:first-child)
-        margin-top: -24px
-        margin-bottom: -8px
     &:before
         content: ""
         display: block
         border-top: dashed 2px rgba(209, 178, 255, 0.72)
         position: relative
-        top: 16px
-    &:first-child:not(:last-child):before
-        top: 8px
-    &:last-child:not(:first-child):before
-        top: 24px
+        top: 0px
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
     &.oe_vertical
-- 
cgit v1.2.3


From fd24ee28c0b00c4b92d193bdb12cb8c1af120a4f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 12:20:14 +0200
Subject: [IMP] website snippets: change style of edit button; add font and fix
 bootstrap; add style menu

bzr revid: chm@openerp.com-20130919102014-vf8etjniyevj40n3
---
 addons/website/static/src/css/editor.sass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3b6e6c088a8..d71be46c1ac 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -139,6 +139,9 @@ table.editorbar-panel
     box-shadow: 0px 10px 10px -10px black inset
     z-index: 1010
     overflow: hidden
+    height: 110px
+    &:hover
+        height: auto
     .scroll
         white-space: nowrap
         overflow-y: auto
@@ -310,28 +313,25 @@ table.editorbar-panel
         display: inline-block
 
     .oe_overlay_options
+        position: absolute
+        width: 100%
+        text-align: center
+        top: -11px
         display: none
         z-index: 1002
-        .oe_options,.oe_label,.oe_move
-            position: absolute
-            display: block
-            z-index: 1002
-            top: -11px
-        .oe_options
+        > div
+            display: inline-block
+        .btn
             pointer-events: auto
-            left: -14px
+            display: inline-block
         .oe_label
-            top: -8px
+            position: absolute
+            top: 3px
             right: 6px
             background: #fff
             font-size: 75%
             color: rgba(153, 0, 255, 0.5)
             padding: 0 5px
-        .oe_move
-            pointer-events: auto
-            left: 50%
-            .js_box_move
-                margin-left: -50%
         .dropdown-menu select,.dropdown-menu input
             display: block
     &.oe_active .oe_overlay_options
-- 
cgit v1.2.3


From 5bb8fb451c7c6f5cdba73a6fec7e91ee1d4007fb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 14:32:06 +0200
Subject: [IMP] website snippets: customize and style options inside overlay

bzr revid: chm@openerp.com-20130919123206-kmn3tjxvqykvk0z6
---
 addons/website/static/src/css/editor.sass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d71be46c1ac..162329e60b7 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -322,8 +322,13 @@ table.editorbar-panel
         > div
             display: inline-block
         .btn
-            pointer-events: auto
             display: inline-block
+            pointer-events: auto
+        a
+            pointer-events: auto
+        .dropdown-menu
+            text-align: left
+            min-width: 180px
         .oe_label
             position: absolute
             top: 3px
-- 
cgit v1.2.3


From bfb9eb5b0a4d15cb36362514885bf7833cd66f4d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 14:34:11 +0200
Subject: [fix] website snippets: style options without href

bzr revid: chm@openerp.com-20130919123411-fju5szr855m6g7ou
---
 addons/website/static/src/css/editor.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 162329e60b7..4f726742e3f 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -326,6 +326,7 @@ table.editorbar-panel
             pointer-events: auto
         a
             pointer-events: auto
+            cursor: pointer
         .dropdown-menu
             text-align: left
             min-width: 180px
-- 
cgit v1.2.3


From 20b391d6c812cb161d34056ef6255579ffef6119 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 15:50:01 +0200
Subject: [IMP] website snippet: add alert for drop error

bzr revid: chm@openerp.com-20130919135001-cfrzyq69ewftu16s
---
 addons/website/static/src/css/editor.sass | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4f726742e3f..974e3cdef9e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,6 +129,13 @@ table.editorbar-panel
 
 /* ---- SNIPPET EDITOR ---- */
 
+#oe_droperror
+    .modal-header
+        border-bottom: 0
+    .modal-footer
+        border-top: 0
+        margin: 0
+        padding: 0
 
 #oe_snippets
     position: fixed
-- 
cgit v1.2.3


From 69bc7fc9edce23a8610e74329b7732f1387f5569 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 19 Sep 2013 17:57:01 +0200
Subject: [IMP] warning dialog for undrop widget

bzr revid: fp@tinyerp.com-20130919155701-szh6spszvfg1kuc1
---
 addons/website/static/src/css/editor.sass | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 974e3cdef9e..565cb38d038 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,14 +129,6 @@ table.editorbar-panel
 
 /* ---- SNIPPET EDITOR ---- */
 
-#oe_droperror
-    .modal-header
-        border-bottom: 0
-    .modal-footer
-        border-top: 0
-        margin: 0
-        padding: 0
-
 #oe_snippets
     position: fixed
     left: 0px
@@ -253,13 +245,18 @@ table.editorbar-panel
         background: rgba(153, 0, 255, 0.17)
         border-radius: 3px
 
-.oe_drop_zone
+.oe_drop_zone, .oe_drop_zone_style
     background: rgba(153, 0, 255, 0.17)
     border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
         z-index: 1001
 
+.oe_drop_zone_style
+    color: white
+    height: 48px
+    margin-bottom: 32px
+
 /* ---- SNIPPET MANIPULATOR ---- */
 
 .oe_overlay
-- 
cgit v1.2.3


From 6b7e32155d948b6b01911514f996a3e098fd7364 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 19 Sep 2013 18:48:55 +0200
Subject: [IMP] Image selector

bzr revid: fp@tinyerp.com-20130919164855-0xmiofe2a2mkqmq2
---
 addons/website/static/src/css/editor.sass | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 565cb38d038..7419139c312 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -104,25 +104,12 @@ table.editorbar-panel
     -o-user-select: auto
     user-select: auto
 
-.modal .existing-attachments a.thumbnail
-    position: relative
-
-    &.selected:before
-        text-decoration: none
-        font-size: 150%
-        background-color: rgba(0, 0, 0, 0.3)
-        color: #21dc0f
-        content: "✔"
-
-        height: 2em
-        width: 2em
-        text-align: center
-        padding: 5px
-        border-radius: 4px 0
+.modal-dialog.select-image
+    width: 80%
 
-        position: absolute
-        top: 0
-        left: 0
+.modal .existing-attachments
+    .pager
+        margin: 0
 
 .modal .image-preview
     margin-bottom: 0.5em
@@ -219,6 +206,7 @@ table.editorbar-panel
 /* ---- SNIPPETS DROP ZONES ---- */
 
 
+
 .oe_drop_zone.oe_insert
     display: block
     height: 48px
-- 
cgit v1.2.3


From 8e85305ee1cf1a23c3c10c277dfc9df6e21744ed Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 10:49:52 +0200
Subject: [IMP] website snippet: join overlay buttons; remove label

bzr revid: chm@openerp.com-20130920084952-j1aqk6371neq1xgt
---
 addons/website/static/src/css/editor.sass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7419139c312..a0c26e79ccf 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -311,12 +311,12 @@ table.editorbar-panel
         top: -11px
         display: none
         z-index: 1002
-        > div
-            display: inline-block
-        .btn
+        > *
+            margin: 0 -2px 0 -3px
             display: inline-block
-            pointer-events: auto
-        a
+        *
+            border-radius: 0
+        .btn, a
             pointer-events: auto
             cursor: pointer
         .dropdown-menu
-- 
cgit v1.2.3


From efa72cae7b75f19fd4498d2ff6b17ccbb9dad5f9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 12:08:21 +0200
Subject: [FIX] website snippet: drop zone for column with firefox

bzr revid: chm@openerp.com-20130920100821-qyy7n8j8612pzg3k
---
 addons/website/static/src/css/editor.sass | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

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
-- 
cgit v1.2.3


From 746f0b44fa52f918bf02af39c1430d16037a5e13 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 12:16:54 +0200
Subject: [FIX] website snippet: col-md-12 in float:left

bzr revid: chm@openerp.com-20130920101654-5axnbn0kvmwayqz5
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 09fb88511c6..0ec65a63073 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -206,7 +206,7 @@ table.editorbar-panel
 /* ---- SNIPPETS DROP ZONES ---- */
 
 
-.col-md-12[data-snippet-id="colmd"]
+.col-md-12
     float: left
 .oe_drop_zone.oe_insert
     display: block
-- 
cgit v1.2.3


From 3e890e865b5848a0ddf352ad2e5ccb2c674faea0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 12:18:35 +0200
Subject: [IMP] website snippet: bigger vertical drop zone

bzr revid: chm@openerp.com-20130920101835-zb531gvn9odtfwld
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 0ec65a63073..d275faa34fd 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -226,10 +226,10 @@ table.editorbar-panel
     &.oe_hover:before
         border-top: dashed 2px rgba(116, 255, 161, 0.72)
     &.oe_vertical
-        width: 24px
+        width: 48px
         float: left
         position: relative
-        margin: 0px -12px !important
+        margin: 0px -24px !important
     &.oe_overlay
         background: rgba(153, 0, 255, 0.17)
         border-radius: 3px
-- 
cgit v1.2.3


From 824c098aeffc53383b9d58116c7b87824ac001a8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 14:22:32 +0200
Subject: [FIX] seo whitespace

bzr revid: ddm@openerp.com-20130920122232-58di0ozyax9qy4or
---
 addons/website/static/src/css/editor.sass | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d275faa34fd..4db40a8f9c2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -429,13 +429,24 @@ $icon_close: #E00101
 /* ---- SEO TOOLS ---- */
 
 $remove_color: $icon_close
+$in_title_color: #5cb85c
+$in_description_color: #428bca
+$in_body_color: #5bc0de
 .oe_seo_configuration
     .modal-dialog
         width: 80%
     .oe_remove
         color: $remove_color
-    .oe_seo_suggestion
+    .oe_seo_keyword
         cursor: pointer
+        padding: .2em .4em .2em .5em
+        border-radius: .4em
+    .keyword-in-title
+        background-color: $in_title_color
+    .keyword-in-description
+        background-color: $in_description_color
+    .keyword-in-body
+        background-color: $in_body_color
 
 /* ---- ACE EDITOR ---- */
 
-- 
cgit v1.2.3


From a139fb4d4898fb19448752a50534ecbca86ca17f Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 15:28:32 +0200
Subject: [IMP] small SEO usability improvements

bzr revid: ddm@openerp.com-20130920132832-zlbbg4qk9t7gt4sb
---
 addons/website/static/src/css/editor.sass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4db40a8f9c2..20fa98ec96d 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -432,21 +432,26 @@ $remove_color: $icon_close
 $in_title_color: #5cb85c
 $in_description_color: #428bca
 $in_body_color: #5bc0de
+$highlighted_text_color: #ffffff
 .oe_seo_configuration
     .modal-dialog
         width: 80%
     .oe_remove
         color: $remove_color
-    .oe_seo_keyword
+    .oe_seo_suggestion
         cursor: pointer
+    .oe_seo_keyword
         padding: .2em .4em .2em .5em
         border-radius: .4em
     .keyword-in-title
         background-color: $in_title_color
+        color: $highlighted_text_color
     .keyword-in-description
         background-color: $in_description_color
+        color: $highlighted_text_color
     .keyword-in-body
         background-color: $in_body_color
+        color: $highlighted_text_color
 
 /* ---- ACE EDITOR ---- */
 
-- 
cgit v1.2.3


From 279c07ccc2e78ac161fcdb45c135ee8d8be09894 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 16:49:22 +0200
Subject: [FIX] website swnippet: button, column

bzr revid: chm@openerp.com-20130920144922-g9121ukw4pqm0heo
---
 addons/website/static/src/css/editor.sass | 33 +++++--------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 20fa98ec96d..f33b15cdb92 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -249,27 +249,18 @@ table.editorbar-panel
 /* ---- SNIPPET MANIPULATOR ---- */
 
 .oe_overlay
-    display: block
+    display: none
     position: absolute
     background: transparent
     border-radius: 3px
-    opacity: 0
     transition: opacity 100ms linear
     box-sizing: border-box
     pointer-events: none
-    &.oe_hover
-        opacity: 1
-        cursor: pointer
-    &.oe_selected, &.oe_active
-        opacity: 1
+    &.oe_active
+        display: block
         border-style: dashed
         border-width: 1px
         box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
-    &.oe_selected
-        border-color: rgba(0, 153, 255, 0.5)
-    .oe_handle
-        display: none !important
-    &.oe_active
         border-color: rgba(153, 0, 255, 0.5)
         .oe_handle
             display: block !important
@@ -310,31 +301,17 @@ table.editorbar-panel
         width: 100%
         text-align: center
         top: -11px
-        display: none
         z-index: 1002
-        > *
-            margin: 0 -2px 0 -3px
-            display: inline-block
-        *
-            border-radius: 0
         .btn, a
             pointer-events: auto
             cursor: pointer
+        .dropdown
+            display: inline-block
         .dropdown-menu
             text-align: left
             min-width: 180px
-        .oe_label
-            position: absolute
-            top: 3px
-            right: 6px
-            background: #fff
-            font-size: 75%
-            color: rgba(153, 0, 255, 0.5)
-            padding: 0 5px
         .dropdown-menu select,.dropdown-menu input
             display: block
-    &.oe_active .oe_overlay_options
-        display: block
 
 .oe_handle
     pointer-events: auto
-- 
cgit v1.2.3


From 691aace187c2ee6561c6c3453709c917505d1de9 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 17:14:30 +0200
Subject: [FIX] Ace theme-independent font

bzr revid: ddm@openerp.com-20130920151430-p20peqy2kdhjg7gf
---
 addons/website/static/src/css/editor.sass | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f33b15cdb92..6eb47eab614 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -437,6 +437,10 @@ $editorbar_height: 40px
 // TODO Fix => might break with themes
 $navbar_height: 51px
 
+@mixin editor-font
+    font-size: 14px
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace
+    line-height: normal
 .oe_ace_view_editor
     transition: all 0.2s ease-in
     -webkit-transition: all 0.2s ease-in
@@ -458,9 +462,11 @@ $navbar_height: 51px
         .oe_view_list
             width: 50%
             height: $editorbar_height - 8px
+            @include editor-font
         .btn
             height: $editorbar_height - 8px
             padding: 0 4px 0 4px
+            @include editor-font
     .ace_editor
         position: absolute
         top: $editorbar_height
-- 
cgit v1.2.3


From 33ab9a60d6102076413ba837877ad5fb1f5a4467 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 20:42:11 +0200
Subject: [IMP] website snippet: test with cache and highlight

bzr revid: chm@openerp.com-20130920184211-t7aa6e2nna1th6yi
---
 addons/website/static/src/css/editor.sass | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 6eb47eab614..4d5cf5081e4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -116,6 +116,17 @@ table.editorbar-panel
 
 /* ---- SNIPPET EDITOR ---- */
 
+#oe_snippet_cache
+    background: rgba(0,0,0,.4)
+    position: fixed
+    top: 0
+    left: 0
+    z-index: 1001
+    width: 100%
+    height: 100%
+    display: none
+    pointer-events: none
+
 #oe_snippets
     position: fixed
     left: 0px
@@ -239,7 +250,7 @@ table.editorbar-panel
     border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
-        z-index: 1001
+        z-index: 1002
 
 .oe_drop_zone_style
     color: white
@@ -248,6 +259,11 @@ table.editorbar-panel
 
 /* ---- SNIPPET MANIPULATOR ---- */
 
+.oe_snippet_overlay_activate
+    position: relative
+    z-index: 1003
+    background: rgba(255,255,255,1)
+
 .oe_overlay
     display: none
     position: absolute
@@ -256,6 +272,7 @@ table.editorbar-panel
     transition: opacity 100ms linear
     box-sizing: border-box
     pointer-events: none
+    z-index: 1003
     &.oe_active
         display: block
         border-style: dashed
@@ -301,7 +318,7 @@ table.editorbar-panel
         width: 100%
         text-align: center
         top: -11px
-        z-index: 1002
+        z-index: 1003
         .btn, a
             pointer-events: auto
             cursor: pointer
-- 
cgit v1.2.3


From 76ad91d3dad70d09c666502d0eb5ad6dab097237 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 21 Sep 2013 11:51:16 +0200
Subject: [IMP] manifest

bzr revid: fp@openerp.com-20130921095116-z7e6yo0x1eplfadx
---
 addons/website/static/src/css/editor.sass | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4d5cf5081e4..6eb47eab614 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -116,17 +116,6 @@ table.editorbar-panel
 
 /* ---- SNIPPET EDITOR ---- */
 
-#oe_snippet_cache
-    background: rgba(0,0,0,.4)
-    position: fixed
-    top: 0
-    left: 0
-    z-index: 1001
-    width: 100%
-    height: 100%
-    display: none
-    pointer-events: none
-
 #oe_snippets
     position: fixed
     left: 0px
@@ -250,7 +239,7 @@ table.editorbar-panel
     border-radius: 3px
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
-        z-index: 1002
+        z-index: 1001
 
 .oe_drop_zone_style
     color: white
@@ -259,11 +248,6 @@ table.editorbar-panel
 
 /* ---- SNIPPET MANIPULATOR ---- */
 
-.oe_snippet_overlay_activate
-    position: relative
-    z-index: 1003
-    background: rgba(255,255,255,1)
-
 .oe_overlay
     display: none
     position: absolute
@@ -272,7 +256,6 @@ table.editorbar-panel
     transition: opacity 100ms linear
     box-sizing: border-box
     pointer-events: none
-    z-index: 1003
     &.oe_active
         display: block
         border-style: dashed
@@ -318,7 +301,7 @@ table.editorbar-panel
         width: 100%
         text-align: center
         top: -11px
-        z-index: 1003
+        z-index: 1002
         .btn, a
             pointer-events: auto
             cursor: pointer
-- 
cgit v1.2.3


From b783cbf4a628cbab5cc3bc7ec4a368970b6fcdd1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 23 Sep 2013 13:54:17 +0200
Subject: [ADD] Translator

bzr revid: fme@openerp.com-20130923115417-bq20piq7f11pyjve
---
 addons/website/static/src/css/editor.sass | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 6eb47eab614..b5c0b21a197 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -93,6 +93,20 @@ table.editorbar-panel
     td.selected
         background-color: #b1c9d9
 
+// ---- TRANSLATIONS ---- {{{
+.oe_translate_examples li
+    margin: 10px
+    padding: 4px
+.oe_translatable_text
+    outline: 1px solid black
+.oe_translatable_field
+    outline: 1px dashed black
+.oe_translatable_text.oe_dirty, .oe_translatable_field.oe_dirty
+    outline-color: red
+.oe_translatable_todo
+    background: rgb(255, 255, 182)
+// }}}
+
 /* ---- RTE ---- */
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
@@ -481,3 +495,5 @@ $navbar_height: 51px
     &.oe_ace_closed
         width: 0
         opacity: 0
+
+// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
-- 
cgit v1.2.3


From f79d27e9a3a9fb1d16d2af44d3f0f8a1eb4abf1a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 24 Sep 2013 21:06:37 +0200
Subject: [FIX] Update translations

bzr revid: fme@openerp.com-20130924190637-0qgzp58lzan8j1oc
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index b5c0b21a197..00ee3df5014 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -103,6 +103,8 @@ table.editorbar-panel
     outline: 1px dashed black
 .oe_translatable_text.oe_dirty, .oe_translatable_field.oe_dirty
     outline-color: red
+.oe_translatable_text.oe_dirty:empty
+    padding: 0 10px
 .oe_translatable_todo
     background: rgb(255, 255, 182)
 // }}}
-- 
cgit v1.2.3


From 60e2a03700a073b50bd31102b6b562d56f0cc5dc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 27 Sep 2013 14:41:16 +0200
Subject: [IMP] website snippet: background option for paralax and fix banner

bzr revid: chm@openerp.com-20130927124116-o2244s5ufu18pvcx
---
 addons/website/static/src/css/editor.sass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 891630b63a4..bf8e7c1686c 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -232,7 +232,8 @@ table.editorbar-panel
     display: block
     height: 48px
     margin: 0px
-    margin-bottom: -48px
+    margin-top: -4px
+    margin-bottom: -44px
     -webkit-transition: margin 250ms linear
     width: 100%
     position: absolute
-- 
cgit v1.2.3


From 8d3db3a13f8c03348c92f5f2e166668450aa3996 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 27 Sep 2013 17:26:25 +0200
Subject: [IMP] website_sale: responsible design (css height)

bzr revid: chm@openerp.com-20130927152625-mrr0r2514qfwyisp
---
 addons/website/static/src/css/editor.sass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index bf8e7c1686c..406b8feeb78 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -225,9 +225,6 @@ table.editorbar-panel
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
-
-.col-md-12
-    float: left
 .oe_drop_zone.oe_insert
     display: block
     height: 48px
-- 
cgit v1.2.3


From 634a4d534841fb9eda22670af1f3b2fa23de33c9 Mon Sep 17 00:00:00 2001
From: Nicolas Wisniewski <nwi@openerp.com>
Date: Tue, 1 Oct 2013 15:43:04 +0200
Subject: [IMP] Improve look & feel of snippets ( test purpose )

bzr revid: nwi@openerp.com-20131001134304-cldj2bynoqt5bsb9
---
 addons/website/static/src/css/editor.sass | 39 +++++++++++++------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 406b8feeb78..4a245b1f2c9 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,5 +1,7 @@
 @charset "utf-8"
 
+@import "compass/css3"
+
 /* ---- CKEditor Minimal Reset ---- */
 
 .navbar.navbar-inverse .cke_chrome
@@ -145,33 +147,30 @@ table.editorbar-panel
     box-shadow: 0px 10px 10px -10px black inset
     z-index: 1010
     overflow: hidden
-    height: 110px
     &:hover
         height: auto
     .scroll
         white-space: nowrap
         overflow-y: auto
     .nav
-        padding: 3px 15px
-        width: 162px
-        background: #444444
         > li
-            display: block
+            display: inline-block
             float: none
+            font-size: 13px
             > a
                 padding: 2px 10px !important
                 width: 100%
                 display: block
         position: fixed
         z-index: 1
-        height: 108px
     .pill-content
+        margin-top: 24px
         display: inline-block
-        height: 110px
         white-space: nowrap
-        padding-left: 166px
         > div
             display: inline-block
+            background: rgb(0,0,0)
+            padding: 5px
             label
                 width: 44px
                 height: 100%
@@ -180,22 +179,14 @@ table.editorbar-panel
                 div
                     width: 100px
                     text-align: center
-                    -webkit-transform: translate(-39px, 44px) rotate(-90deg)
-                    -moz-transform: translate(-39px, 44px) rotate(-90deg)
-                    -o-transform: translate(-39px, 44px) rotate(-90deg)
-                    transform: translate(-39px, 44px) rotate(-90deg)
-                    -webkit-transform-origin: 50% 50%
-                    -moz-transform-origin: 50% 50%
-                    -ms-transform-origin: 50% 50%
-                    -o-transform-origin: 50% 50%
-                    transform-origin: 50% 50%
+                    @include transform( translate(-39px, 44px) , rotate(-90deg) ) 
+                    @include transform-origin(50% 50%)
 
 .oe_snippet
     display: inline-block
     vertical-align: top
-    width: 108px
-    height: 108px
-    border-radius: 3px
+    width: 100px
+    height: 100px
     margin: 1px
     margin-top: 0px
     position: relative
@@ -204,15 +195,18 @@ table.editorbar-panel
     user-select: none
     cursor: move
     pointer-events: none
-
     .oe_snippet_thumbnail
         pointer-events: auto
         text-align: center
         height: 100%
         background: transparent
         color: white
-        text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95)
         position: relative
+        .oe_snippet_thumbnail_title
+            font-size: 12px
+            display: block
+        .oe_snippet_thumbnail_img
+            box-shadow: inset 0px 0px 0px 3px #333333
         span, div
             line-height: 18px
     & > :not(.oe_snippet_thumbnail)
@@ -221,7 +215,6 @@ table.editorbar-panel
 #oe_snippets .oe_snippet_thumbnail
     background: rgb(116, 116, 116)
     background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
-    box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.07) inset
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
-- 
cgit v1.2.3


From 3b49d2cf32d7628f1f3f0ce634edae4709b41291 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 1 Oct 2013 18:01:14 +0200
Subject: [IMP] Editor basic tour

bzr revid: ddm@openerp.com-20131001160114-d87oq16mxak3xslj
---
 addons/website/static/src/css/editor.sass | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 406b8feeb78..54c6b6576de 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -500,4 +500,9 @@ $navbar_height: 51px
         width: 0
         opacity: 0
 
+/* ---- EDITOR TOUR ---- */
+
+.popover.tour-tour
+    z-index: 2010
+
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
-- 
cgit v1.2.3


From 7d7cbce6fd8c30986f5dee3002e63080a58ece59 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 Oct 2013 13:22:16 +0200
Subject: [IMP] compass all the things

bzr revid: xmo@openerp.com-20131002112216-sjfvkg2ja0aoss2v
---
 addons/website/static/src/css/editor.sass | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 4a245b1f2c9..e74c81932a4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,6 +1,8 @@
 @charset "utf-8"
 
 @import "compass/css3"
+@import "compass/css3/user-interface"
+@import "compass/css3/transition"
 
 /* ---- CKEditor Minimal Reset ---- */
 
@@ -39,8 +41,7 @@
     padding: 2px
     margin: 0
     z-index: 20000
-    background-color: #414141
-    background: -webkit-linear-gradient(#646060, #262626)
+    @include background(#414141, linear-gradient(#646060, #262626))
     box-sizing: border-box
     li
         display: inline
@@ -116,11 +117,7 @@ table.editorbar-panel
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
 // about them either
 .oe_editable .btn
-    -webkit-user-select: auto
-    -moz-user-select: auto
-    -ms-user-select: auto
-    -o-user-select: auto
-    user-select: auto
+    @include user-select(auto)
 
 .modal-dialog.select-image
     width: 80%
@@ -213,8 +210,7 @@ table.editorbar-panel
         display: none !important
 
 #oe_snippets .oe_snippet_thumbnail
-    background: rgb(116, 116, 116)
-    background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
+    @include background(#747474, radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4)))
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
@@ -224,7 +220,7 @@ table.editorbar-panel
     margin: 0px
     margin-top: -4px
     margin-bottom: -44px
-    -webkit-transition: margin 250ms linear
+    @include transition(margin 250ms linear)
     width: 100%
     position: absolute
     z-index: 1000
@@ -264,7 +260,7 @@ table.editorbar-panel
     position: absolute
     background: transparent
     border-radius: 3px
-    transition: opacity 100ms linear
+    @include transition(opacity 100ms linear)
     box-sizing: border-box
     pointer-events: none
     &.oe_active
@@ -291,7 +287,7 @@ table.editorbar-panel
                 font-size: 14px
                 line-height: 14px
                 color: rgba(153, 0, 255, 1)
-                -webkit-transition: background 100ms linear
+                @include transition(background 100ms linear)
             &:hover:before
                 background: rgba(153, 0, 255, 1)
                 color: #fff
@@ -379,9 +375,8 @@ $icon_close: #E00101
     &.modal .modal-content
         height: 660px
         background-color: $mobile_preview_background
-        border: 2px solid
+        border: 2px solid $mobile_preview_border
         border-radius: 10px
-        border-color: $mobile_preview_border
         margin: auto
         top: 0
         left: 0
@@ -453,11 +448,7 @@ $navbar_height: 51px
     font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace
     line-height: normal
 .oe_ace_view_editor
-    transition: all 0.2s ease-in
-    -webkit-transition: all 0.2s ease-in
-    -ms-transition: all 0.2s ease-in
-    -o-transition: all 0.2s ease-in
-    -moz-transition: all 0.2s ease-in
+    @include transition(all 0.2s ease-in)
     opacity: 0.3
     position: fixed
     top: $navbar_height
-- 
cgit v1.2.3


From 400ffb7f07c512a983859dadc7fea00f0ec1be5c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 2 Oct 2013 16:45:54 +0200
Subject: [FIX] disable relative positioning of cke widget wrapper

It's only used to be able to position the drag & drop widget
absolutely, and we've already disabled that one.

Product page is a gory mess of absolute positioning, if product images
are changed into a t-field the relative positioning on the wrapper
makes the image itself disappear completely.

bzr revid: xmo@openerp.com-20131002144554-1rg4zmwu0btf0r0f
---
 addons/website/static/src/css/editor.sass | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e74c81932a4..4f962f02151 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,6 +129,10 @@ table.editorbar-panel
 .modal .image-preview
     margin-bottom: 0.5em
 
+// wrapper positioned relatively for drag&drop widget which is disabled below.
+// Breaks completely horribly crazy products listing page, so take it out.
+.cke_widget_wrapper
+    position: static !important
 // "remove" drag & drop of CKE widgets
 .cke_widget_drag_handler_container
     display: none !important
-- 
cgit v1.2.3


From 939a344a90e45add0f4e1dc1359c37e803d2455d Mon Sep 17 00:00:00 2001
From: Nicolas Wisniewski <nwi@openerp.com>
Date: Fri, 4 Oct 2013 10:43:02 +0200
Subject: [IMP] Use more compass mixins

bzr revid: nwi@openerp.com-20131004084302-0goiqm0bq7v8up18
---
 addons/website/static/src/css/editor.sass | 52 +++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e74c81932a4..66bbb988016 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -26,9 +26,7 @@
 .navbar.navbar-inverse .cke_top
     background: transparent
     border: none
-    box-shadow: none
-    -webkit-box-shadow: none
-    -moz-box-shadow: none
+    +box-shadow(none)
 
 /* ---- OpenERP Style ---- */
 
@@ -42,13 +40,13 @@
     margin: 0
     z-index: 20000
     @include background(#414141, linear-gradient(#646060, #262626))
-    box-sizing: border-box
+    +box-sizing(border-box)
     li
         display: inline
         color: #eee
         &:hover
             background: rgba(0,0,0,0.2)
-            text-shadow: black 0px 0px 3px
+            +text-shadow(black 0px 0px 3px)
             color: white
 
 .oe_website_editorbar .oe_rte_toolbar
@@ -141,7 +139,7 @@ table.editorbar-panel
     right: 0px
     top: 50px
     background: rgb(40,40,40)
-    box-shadow: 0px 10px 10px -10px black inset
+    +box-shadow(0px 10px 10px -10px black inset)
     z-index: 1010
     overflow: hidden
     &:hover
@@ -188,8 +186,7 @@ table.editorbar-panel
     margin-top: 0px
     position: relative
     overflow: hidden
-    -webkit-user-select: none
-    user-select: none
+    +user-select(none)
     cursor: move
     pointer-events: none
     .oe_snippet_thumbnail
@@ -203,7 +200,7 @@ table.editorbar-panel
             font-size: 12px
             display: block
         .oe_snippet_thumbnail_img
-            box-shadow: inset 0px 0px 0px 3px #333333
+            +box-shadow(inset 0px 0px 0px 3px #333333)
         span, div
             line-height: 18px
     & > :not(.oe_snippet_thumbnail)
@@ -243,7 +240,7 @@ table.editorbar-panel
 
 .oe_drop_zone, .oe_drop_zone_style
     background: rgba(153, 0, 255, 0.17)
-    border-radius: 3px
+    +border-radius(3px)
     &.oe_hover
         background: rgba(0, 255, 133, 0.22)
         z-index: 1001
@@ -259,15 +256,15 @@ table.editorbar-panel
     display: none
     position: absolute
     background: transparent
-    border-radius: 3px
+    +border-radius(3px)
     @include transition(opacity 100ms linear)
-    box-sizing: border-box
+    +box-sizing(border-box)
     pointer-events: none
     &.oe_active
         display: block
         border-style: dashed
         border-width: 1px
-        box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
+        +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset)
         border-color: rgba(153, 0, 255, 0.5)
         .oe_handle
             display: block !important
@@ -279,7 +276,7 @@ table.editorbar-panel
                 display: block
                 background: rgba(255, 255, 255, 1)
                 border: solid 1px rgba(153, 0, 255, 1)
-                border-radius: 8px
+                +border-radius(8px)
                 width: 16px
                 height: 16px
                 margin: -8px
@@ -326,7 +323,7 @@ table.editorbar-panel
     top: 50%
     left: 50%
     display: block
-    box-sizing: border-box
+    +box-sizing(border-box)
     width: 8px
     height: 8px
     margin: -4px
@@ -376,7 +373,7 @@ $icon_close: #E00101
         height: 660px
         background-color: $mobile_preview_background
         border: 2px solid $mobile_preview_border
-        border-radius: 10px
+        +border-radius(10px)
         margin: auto
         top: 0
         left: 0
@@ -386,16 +383,16 @@ $icon_close: #E00101
         .modal-header
             background-color: $mobile_preview_background
             border-bottom: 0
-            border-top-left-radius: 10px
-            border-top-right-radius: 10px
+            +border-top-left-radius(10px)
+            +border-top-right-radius(10px)
             .modal-title
                 color: $mobile_preview_border
             .close
                 color: lightgrey
-                opacity: 1
+                +opacity(1)
             .close:hover
                 color: $icon_close
-                opacity: 1
+                +opacity(1)
         .modal-body
             background-color: $mobile_preview_background
             max-height: 600px
@@ -425,9 +422,9 @@ $highlighted_text_color: #ffffff
         cursor: pointer
     .oe_seo_keyword
         padding: .2em .4em .2em .5em
-        border-radius: .4em
+        +border-radius(.4em)
     .keyword-in-title
-        background-color: $in_title_color
+        background-color: $in_title_color+pointer
         color: $highlighted_text_color
     .keyword-in-description
         background-color: $in_description_color
@@ -442,6 +439,10 @@ $ace_width: 720px
 $editorbar_height: 40px
 // TODO Fix => might break with themes
 $navbar_height: 51px
+@mixin pointer-events($type: none)
+    $type: unquote($type)
+    @include experimental(pointer-events, $type,-moz, -webkit, not -o, not -ms, -khtml, official)
+
 
 @mixin editor-font
     font-size: 14px
@@ -449,7 +450,7 @@ $navbar_height: 51px
     line-height: normal
 .oe_ace_view_editor
     @include transition(all 0.2s ease-in)
-    opacity: 0.3
+    +opacity(0.3)
     position: fixed
     top: $navbar_height
     right: 0
@@ -477,11 +478,10 @@ $navbar_height: 51px
         left: 0
         width: $ace_width
     &:hover
-        opacity: 1
+        +opacity(1)
     &.oe_ace_open
         width: $ace_width
     &.oe_ace_closed
         width: 0
-        opacity: 0
-
+        +opacity(0)
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
-- 
cgit v1.2.3


From b1c4741154caefbf9d75c38cab34e9589e5d486d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 4 Oct 2013 11:37:40 +0200
Subject: [IMP] Support for multiple tutorials

bzr revid: ddm@openerp.com-20131004093740-3dxcktks5x2xb4t2
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f676b757ca8..c5e3f39b7c8 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -176,7 +176,7 @@ table.editorbar-panel
                 div
                     width: 100px
                     text-align: center
-                    @include transform( translate(-39px, 44px) , rotate(-90deg) ) 
+                    @include transform( translate(-39px, 44px) , rotate(-90deg) )
                     @include transform-origin(50% 50%)
 
 .oe_snippet
@@ -486,7 +486,7 @@ $navbar_height: 51px
 
 /* ---- EDITOR TOUR ---- */
 
-.popover.tour-tour
+.popover.tour
     z-index: 2010
 
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
-- 
cgit v1.2.3


From 865a7cb53a0aa8c3b639f6abb96c0e23c69260ea Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 4 Oct 2013 12:41:33 +0200
Subject: [IMP] website: xml snippets server side + improve loading speed

bzr revid: chm@openerp.com-20131004104133-q1p2fdf153izeqyj
---
 addons/website/static/src/css/editor.sass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 66bbb988016..ac359e07cc4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -156,14 +156,15 @@ table.editorbar-panel
                 padding: 2px 10px !important
                 width: 100%
                 display: block
+                border: 0
         position: fixed
         z-index: 1
-    .pill-content
+        border: 0
+    .tab-content
         margin-top: 24px
         display: inline-block
         white-space: nowrap
         > div
-            display: inline-block
             background: rgb(0,0,0)
             padding: 5px
             label
-- 
cgit v1.2.3


From 55a46265c3b246cff3737420b90669d4fddce495 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 4 Oct 2013 16:41:28 +0200
Subject: [IMP] building blocks zone

bzr revid: fp@tinyerp.com-20131004144128-5e4l3dze02m1b2vr
---
 addons/website/static/src/css/editor.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ac359e07cc4..a620b0d98ea 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -250,6 +250,7 @@ table.editorbar-panel
     color: white
     height: 48px
     margin-bottom: 32px
+    padding-top: 12px
 
 /* ---- SNIPPET MANIPULATOR ---- */
 
-- 
cgit v1.2.3


From d7b75724cb3d0f96941304d3736590e7f0f6d202 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 4 Oct 2013 18:37:54 +0200
Subject: [IMP] Building Block Zone, SEO Style, bootstrap style by default

bzr revid: fp@tinyerp.com-20131004163754-rwa3t1gcmfok4v0w
---
 addons/website/static/src/css/editor.sass | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index a620b0d98ea..5e4a095e8c4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -425,15 +425,6 @@ $highlighted_text_color: #ffffff
     .oe_seo_keyword
         padding: .2em .4em .2em .5em
         +border-radius(.4em)
-    .keyword-in-title
-        background-color: $in_title_color+pointer
-        color: $highlighted_text_color
-    .keyword-in-description
-        background-color: $in_description_color
-        color: $highlighted_text_color
-    .keyword-in-body
-        background-color: $in_body_color
-        color: $highlighted_text_color
 
 /* ---- ACE EDITOR ---- */
 
-- 
cgit v1.2.3


From 75bf46996c0e7b782f43c782a25adf6edef293b8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 9 Oct 2013 17:20:15 +0200
Subject: [FIX] Tour reset bug

bzr revid: ddm@openerp.com-20131009152015-s2p3hjkivls16yk2
---
 addons/website/static/src/css/editor.sass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 6eab4f6fb32..26838496cc8 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -479,7 +479,8 @@ $navbar_height: 51px
         +opacity(0)
 
 /* ---- EDITOR TOUR ---- */
-
+div.tour-backdrop
+    z-index: 2009
 .popover.tour
     z-index: 2010
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
-- 
cgit v1.2.3


From 6bd53cc2e6914e0349a7d550919d1dc29b101227 Mon Sep 17 00:00:00 2001
From: Nicolas Wisniewski <nwi@openerp.com>
Date: Thu, 10 Oct 2013 10:30:37 +0200
Subject: [FIX] blocks section menu returns to vertical

bzr revid: nwi@openerp.com-20131010083037-6lzhc5285tpevg3j
---
 addons/website/static/src/css/editor.sass | 90 ++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 31 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 26838496cc8..ddb860ddd33 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -4,6 +4,17 @@
 @import "compass/css3/user-interface"
 @import "compass/css3/transition"
 
+//smartphones, iPhone, portrait 480x320 phones 
+$smart_phone: 320px
+//portrait e-readers (Nook/Kindle), smaller tablets @ 600 or @ 640 wide.*/
+$small-tablet: 481px 
+//portrait tablets, portrait iPad, landscape e-readers, landscape 800x480 or 854x480 phones
+$portrait-tablet: 641px 
+//tablet, landscape iPad, lo-res laptops ands desktops 
+$tablet: 961px
+//big landscape tablets, laptops, and desktops  
+$desktop: 1025px
+
 /* ---- CKEditor Minimal Reset ---- */
 
 .navbar.navbar-inverse .cke_chrome
@@ -146,32 +157,40 @@ table.editorbar-panel
         height: auto
     .scroll
         white-space: nowrap
-        overflow-y: auto
+        overflow-y: none
     .nav
+        display: inline-block
+        border-bottom: none !important
+        vertical-align: middle
+        margin-top: 5px
+        min-width: 120px
+        margin-left: 6px
         > li
-            display: inline-block
+            display: block
             float: none
-            font-size: 13px
+            &.active
+                background: black !important
             > a
                 padding: 2px 10px !important
-                width: 100%
+                width: 100% 
                 display: block
                 border: 0
-        position: fixed
         z-index: 1
+    .pill-content
         border: 0
     .tab-content
-        margin-top: 24px
         display: inline-block
         white-space: nowrap
-        > div
+        background: black
+        margin-top: 5px
+        > div   
             background: rgb(0,0,0)
             padding: 5px
             label
                 width: 44px
-                height: 100%
                 color: #fff
                 padding-left: 10px
+                
                 div
                     width: 100px
                     text-align: center
@@ -179,10 +198,9 @@ table.editorbar-panel
                     @include transform-origin(50% 50%)
 
 .oe_snippet
-    display: inline-block
+    float: left
     vertical-align: top
     width: 100px
-    height: 100px
     margin: 1px
     margin-top: 0px
     position: relative
@@ -197,11 +215,17 @@ table.editorbar-panel
         background: transparent
         color: white
         position: relative
+        &:hover
+            .oe_snippet_thumbnail_img
+                @include transform( scale(.95,.95))
         .oe_snippet_thumbnail_title
             font-size: 12px
             display: block
+            +text-shadow(0 0 2px rgb(0,0,0))
         .oe_snippet_thumbnail_img
+            @include transition(all 150ms linear)
             +box-shadow(inset 0px 0px 0px 3px #333333)
+            @include transform( scale(1,1))
         span, div
             line-height: 18px
     & > :not(.oe_snippet_thumbnail)
@@ -236,14 +260,19 @@ table.editorbar-panel
         position: relative
         margin: 0px -24px !important
     &.oe_overlay
-        background: rgba(153, 0, 255, 0.17)
         border-radius: 3px
-
+        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) 
+        //background-size: 100px 100px
+        background: rgba(153, 0, 255,.5)
+        
 .oe_drop_zone, .oe_drop_zone_style
-    background: rgba(153, 0, 255, 0.17)
-    +border-radius(3px)
+    border: none
+    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) 
+    //background-size: 100px 100px
+    background: rgba(153, 0, 255, .3)
+    +border-radius(4px)
     &.oe_hover
-        background: rgba(0, 255, 133, 0.22)
+        background: rgba(0, 255, 133, .3)
         z-index: 1001
 
 .oe_drop_zone_style
@@ -258,6 +287,7 @@ table.editorbar-panel
     display: none
     position: absolute
     background: transparent
+    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.02) ,rgba(255,255,255,.02) 35px, rgba(0,0,0,.02) 35px, rgba(0,0,0,.02) 75px)) 
     +border-radius(3px)
     @include transition(opacity 100ms linear)
     +box-sizing(border-box)
@@ -267,7 +297,7 @@ table.editorbar-panel
         border-style: dashed
         border-width: 1px
         +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset)
-        border-color: rgba(153, 0, 255, 0.5)
+        border-color: rgba(0, 0, 0, 0.5)
         .oe_handle
             display: block !important
             pointer-events: auto
@@ -277,27 +307,29 @@ table.editorbar-panel
                 left: 50%
                 display: block
                 background: rgba(255, 255, 255, 1)
-                border: solid 1px rgba(153, 0, 255, 1)
-                +border-radius(8px)
-                width: 16px
-                height: 16px
-                margin: -8px
+                border: solid 1px rgba(0, 0, 0, .2)
+                +border-radius(5px)
+                width: 18px
+                height: 18px
+                margin: -9px
                 padding-left: 1px
                 font-size: 14px
                 line-height: 14px
-                color: rgba(153, 0, 255, 1)
+                font-family: FontAwesome
+                color: rgba(0,0,0,.5)
                 @include transition(background 100ms linear)
             &:hover:before
-                background: rgba(153, 0, 255, 1)
+                background: rgba(0, 0, 0, .5)
                 color: #fff
+                +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
         .oe_handle.e:before
-            content: "⇨"
+            content: "\F061"
         .oe_handle.s:before
-            content: "⇩"
+            content: "\F063"
         .oe_handle.w:before
-            content: "⇦"
+            content: "\F060"
         .oe_handle.n:before
-            content: "⇧"
+            content: "\F062"
 
     .icon.btn
         display: inline-block
@@ -432,10 +464,6 @@ $ace_width: 720px
 $editorbar_height: 40px
 // TODO Fix => might break with themes
 $navbar_height: 51px
-@mixin pointer-events($type: none)
-    $type: unquote($type)
-    @include experimental(pointer-events, $type,-moz, -webkit, not -o, not -ms, -khtml, official)
-
 
 @mixin editor-font
     font-size: 14px
-- 
cgit v1.2.3


From 6b0d005d44cf79316158702607fea67def209306 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 12 Oct 2013 11:07:48 +0200
Subject: [IMP] Align building blocks

bzr revid: fp@openerp.com-20131012090748-vr7aqap73d9l4hqf
---
 addons/website/static/src/css/editor.sass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ddb860ddd33..d37a5e12020 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -148,7 +148,7 @@ table.editorbar-panel
     position: fixed
     left: 0px
     right: 0px
-    top: 50px
+    top: 51px
     background: rgb(40,40,40)
     +box-shadow(0px 10px 10px -10px black inset)
     z-index: 1010
@@ -162,9 +162,7 @@ table.editorbar-panel
         display: inline-block
         border-bottom: none !important
         vertical-align: middle
-        margin-top: 5px
         min-width: 120px
-        margin-left: 6px
         > li
             display: block
             float: none
@@ -182,10 +180,8 @@ table.editorbar-panel
         display: inline-block
         white-space: nowrap
         background: black
-        margin-top: 5px
         > div   
             background: rgb(0,0,0)
-            padding: 5px
             label
                 width: 44px
                 color: #fff
@@ -223,6 +219,7 @@ table.editorbar-panel
             display: block
             +text-shadow(0 0 2px rgb(0,0,0))
         .oe_snippet_thumbnail_img
+            height: 74px
             @include transition(all 150ms linear)
             +box-shadow(inset 0px 0px 0px 3px #333333)
             @include transform( scale(1,1))
-- 
cgit v1.2.3


From d95570bb4053031ff2fd78dd794dcf1fd5151c76 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 12 Oct 2013 11:23:52 +0200
Subject: [IMP] css align stuff

bzr revid: fp@openerp.com-20131012092352-seprp8l827wxy2wy
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d37a5e12020..82497b6f784 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -196,8 +196,8 @@ table.editorbar-panel
 .oe_snippet
     float: left
     vertical-align: top
-    width: 100px
-    margin: 1px
+    width: 93px
+    margin-left: 1px
     margin-top: 0px
     position: relative
     overflow: hidden
-- 
cgit v1.2.3


From a3c11bedb8148be6e35291d6955994943cc95f71 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 Oct 2013 13:26:44 +0200
Subject: [IMP] mitigate disappearance of empty inline cke widgets

bzr revid: xmo@openerp.com-20131014112644-f95lqkr6j2nlm98a
---
 addons/website/static/src/css/editor.sass | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 51bae3dcf3a..1ef6d67bb49 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -145,6 +145,11 @@ table.editorbar-panel
 // "remove" drag & drop of CKE widgets
 .cke_widget_drag_handler_container
     display: none !important
+// prevent inline widgets from entirely disappearing when their (textual)
+// content is removed
+.cke_widget_editable:empty:after
+    content: " "
+    white-space: pre-wrap
 
 /* ---- SNIPPET EDITOR ---- */
 
-- 
cgit v1.2.3


From e375557b844e393d081019adc03cd5530a6f87fc Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 16 Oct 2013 11:19:47 +0200
Subject: [IMP] Editor flicker+resize (cf. task: [CMS] Source editor)

bzr revid: ddm@openerp.com-20131016091947-5aymhkl1we878bdl
---
 addons/website/static/src/css/editor.sass | 32 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 1ef6d67bb49..db8b0bbf460 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -4,15 +4,15 @@
 @import "compass/css3/user-interface"
 @import "compass/css3/transition"
 
-//smartphones, iPhone, portrait 480x320 phones 
+//smartphones, iPhone, portrait 480x320 phones
 $smart_phone: 320px
 //portrait e-readers (Nook/Kindle), smaller tablets @ 600 or @ 640 wide.*/
-$small-tablet: 481px 
+$small-tablet: 481px
 //portrait tablets, portrait iPad, landscape e-readers, landscape 800x480 or 854x480 phones
-$portrait-tablet: 641px 
-//tablet, landscape iPad, lo-res laptops ands desktops 
+$portrait-tablet: 641px
+//tablet, landscape iPad, lo-res laptops ands desktops
 $tablet: 961px
-//big landscape tablets, laptops, and desktops  
+//big landscape tablets, laptops, and desktops
 $desktop: 1025px
 
 /* ---- CKEditor Minimal Reset ---- */
@@ -179,7 +179,7 @@ table.editorbar-panel
                 background: black !important
             > a
                 padding: 2px 10px !important
-                width: 100% 
+                width: 100%
                 display: block
                 border: 0
         z-index: 1
@@ -189,13 +189,13 @@ table.editorbar-panel
         display: inline-block
         white-space: nowrap
         background: black
-        > div   
+        > div
             background: rgb(0,0,0)
             label
                 width: 44px
                 color: #fff
                 padding-left: 10px
-                
+
                 div
                     width: 100px
                     text-align: center
@@ -267,13 +267,13 @@ table.editorbar-panel
         margin: 0px -24px !important
     &.oe_overlay
         border-radius: 3px
-        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) 
+        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
         //background-size: 100px 100px
         background: rgba(153, 0, 255,.5)
-        
+
 .oe_drop_zone, .oe_drop_zone_style
     border: none
-    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) 
+    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
     //background-size: 100px 100px
     background: rgba(153, 0, 255, .3)
     +border-radius(4px)
@@ -293,7 +293,7 @@ table.editorbar-panel
     display: none
     position: absolute
     background: transparent
-    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.02) ,rgba(255,255,255,.02) 35px, rgba(0,0,0,.02) 35px, rgba(0,0,0,.02) 75px)) 
+    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.02) ,rgba(255,255,255,.02) 35px, rgba(0,0,0,.02) 35px, rgba(0,0,0,.02) 75px))
     +border-radius(3px)
     @include transition(opacity 100ms linear)
     +box-sizing(border-box)
@@ -476,13 +476,12 @@ $navbar_height: 51px
     font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace
     line-height: normal
 .oe_ace_view_editor
-    @include transition(all 0.2s ease-in)
-    +opacity(0.3)
     position: fixed
     top: $navbar_height
     right: 0
     z-index: 1000
     height: 100%
+    width: $ace_width
     .oe_ace_view_editor_title
         width: 100%
         padding-top: 4px
@@ -504,12 +503,9 @@ $navbar_height: 51px
         bottom: $navbar_height
         left: 0
         width: $ace_width
-    &:hover
-        +opacity(1)
     &.oe_ace_open
-        width: $ace_width
+        +opacity(1)
     &.oe_ace_closed
-        width: 0
         +opacity(0)
 
 /* ---- EDITOR TOUR ---- */
-- 
cgit v1.2.3


From 52ef0032e33e9b13b0c1814e7a8e653860a1a34b Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 16 Oct 2013 11:28:52 +0200
Subject: [IMP] Ace editor CSS improvements

bzr revid: ddm@openerp.com-20131016092852-3myx024u2zn5cnvi
---
 addons/website/static/src/css/editor.sass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index db8b0bbf460..461667d8e54 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -467,7 +467,7 @@ $highlighted_text_color: #ffffff
 /* ---- ACE EDITOR ---- */
 
 $ace_width: 720px
-$editorbar_height: 40px
+$editorbar_height: 30px
 // TODO Fix => might break with themes
 $navbar_height: 51px
 
@@ -484,16 +484,16 @@ $navbar_height: 51px
     width: $ace_width
     .oe_ace_view_editor_title
         width: 100%
-        padding-top: 4px
-        padding-left: 4px
+        padding-top: 0
+        padding-left: 0
         height: $editorbar_height
         background: #2F3129
         .oe_view_list
             width: 50%
-            height: $editorbar_height - 8px
+            height: $editorbar_height
             @include editor-font
         .btn
-            height: $editorbar_height - 8px
+            height: $editorbar_height
             padding: 0 4px 0 4px
             @include editor-font
     .ace_editor
@@ -506,6 +506,7 @@ $navbar_height: 51px
     &.oe_ace_open
         +opacity(1)
     &.oe_ace_closed
+        z-index: -1000
         +opacity(0)
 
 /* ---- EDITOR TOUR ---- */
-- 
cgit v1.2.3


From 641477141f39ac02bcd933fb8b0a6f15cf1526de Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 16 Oct 2013 12:10:55 +0200
Subject: [IMP] website snippet: improve visibility of drop zone

bzr revid: chm@openerp.com-20131016101055-p6vhiijvladtbn87
---
 addons/website/static/src/css/editor.sass | 58 ++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 17 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 1ef6d67bb49..becf7dc9ba0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -242,16 +242,45 @@ table.editorbar-panel
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
-.oe_drop_zone.oe_insert
+#dark_for_dropzone
+    width: 100%
+    position: absolute
+    top: 0
+    left: 0
+    opacity: 0.4
+    z-index: 1000
+    pointer-events: none
+    td
+        background: #000
+        &.center.active
+            background: transparent
+
+.oe_drop_zone, .oe_drop_zone_style
+    border: none
+    background: rgba(100, 255, 255, .9)
+    +border-radius(4px)
+    div
+        margin: 0
+        line-height: 48px
+        text-align: center
+        color: #FF00FF
+        font-weight: bold
+        font-size: 24px
+    .oe_active
+        display: none
+
+.oe_drop_zone_style div
+    line-height: 24px
+
+.oe_drop_zone
     display: block
     height: 48px
     margin: 0px
     margin-top: -4px
     margin-bottom: -44px
-    @include transition(margin 250ms linear)
+    z-index: 1002
     width: 100%
     position: absolute
-    z-index: 1000
     &:not(.oe_vertical):before
         content: ""
         display: block
@@ -264,22 +293,17 @@ table.editorbar-panel
         width: 48px
         float: left
         position: relative
-        margin: 0px -24px !important
+        margin: 4px -24px !important
+        div
+            display: none
     &.oe_overlay
         border-radius: 3px
-        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) 
-        //background-size: 100px 100px
-        background: rgba(153, 0, 255,.5)
-        
-.oe_drop_zone, .oe_drop_zone_style
-    border: none
-    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px)) 
-    //background-size: 100px 100px
-    background: rgba(153, 0, 255, .3)
-    +border-radius(4px)
-    &.oe_hover
-        background: rgba(0, 255, 133, .3)
-        z-index: 1001
+    &.oe_drop_active
+        background: rgba(100, 255, 255, .3)
+        div
+            display: none
+        .oe_active
+            display: block
 
 .oe_drop_zone_style
     color: white
-- 
cgit v1.2.3


From 99723a8a9ffa70f8e41806e92de32c52583fc2ad Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 17 Oct 2013 16:19:59 +0200
Subject: [REVERT] snippets drop zone too complex

bzr revid: fp@tinyerp.com-20131017141959-fpkds0a7e1m1sfrw
---
 addons/website/static/src/css/editor.sass | 58 +++++++++----------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index bc8b238736e..461667d8e54 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -242,45 +242,16 @@ table.editorbar-panel
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
-#dark_for_dropzone
-    width: 100%
-    position: absolute
-    top: 0
-    left: 0
-    opacity: 0.4
-    z-index: 1000
-    pointer-events: none
-    td
-        background: #000
-        &.center.active
-            background: transparent
-
-.oe_drop_zone, .oe_drop_zone_style
-    border: none
-    background: rgba(100, 255, 255, .9)
-    +border-radius(4px)
-    div
-        margin: 0
-        line-height: 48px
-        text-align: center
-        color: #FF00FF
-        font-weight: bold
-        font-size: 24px
-    .oe_active
-        display: none
-
-.oe_drop_zone_style div
-    line-height: 24px
-
-.oe_drop_zone
+.oe_drop_zone.oe_insert
     display: block
     height: 48px
     margin: 0px
     margin-top: -4px
     margin-bottom: -44px
-    z-index: 1002
+    @include transition(margin 250ms linear)
     width: 100%
     position: absolute
+    z-index: 1000
     &:not(.oe_vertical):before
         content: ""
         display: block
@@ -293,17 +264,22 @@ table.editorbar-panel
         width: 48px
         float: left
         position: relative
-        margin: 4px -24px !important
-        div
-            display: none
+        margin: 0px -24px !important
     &.oe_overlay
         border-radius: 3px
-    &.oe_drop_active
-        background: rgba(100, 255, 255, .3)
-        div
-            display: none
-        .oe_active
-            display: block
+        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
+        //background-size: 100px 100px
+        background: rgba(153, 0, 255,.5)
+
+.oe_drop_zone, .oe_drop_zone_style
+    border: none
+    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
+    //background-size: 100px 100px
+    background: rgba(153, 0, 255, .3)
+    +border-radius(4px)
+    &.oe_hover
+        background: rgba(0, 255, 133, .3)
+        z-index: 1001
 
 .oe_drop_zone_style
     color: white
-- 
cgit v1.2.3


From a57c7e7c929ca30036acac9ec8a926facf889310 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 10:48:41 +0200
Subject: [IMP] Ace: display 'resize' cursor when hovering over gutter

bzr revid: ddm@openerp.com-20131021084841-efcxt96c5x17u2m1
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 461667d8e54..0c247cbef5b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -503,6 +503,8 @@ $navbar_height: 51px
         bottom: $navbar_height
         left: 0
         width: $ace_width
+        .ace_gutter
+            cursor: ew-resize
     &.oe_ace_open
         +opacity(1)
     &.oe_ace_closed
-- 
cgit v1.2.3


From a403bc0318bc113e2d6801174d3e4164f0a53186 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 11:10:04 +0200
Subject: [IMP] Ace: remember editor width when resizing

bzr revid: ddm@openerp.com-20131021091004-nchmsogl6349az8h
---
 addons/website/static/src/css/editor.sass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 0c247cbef5b..092194e9e10 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -466,7 +466,6 @@ $highlighted_text_color: #ffffff
 
 /* ---- ACE EDITOR ---- */
 
-$ace_width: 720px
 $editorbar_height: 30px
 // TODO Fix => might break with themes
 $navbar_height: 51px
@@ -481,7 +480,6 @@ $navbar_height: 51px
     right: 0
     z-index: 1000
     height: 100%
-    width: $ace_width
     .oe_ace_view_editor_title
         width: 100%
         padding-top: 0
@@ -502,7 +500,6 @@ $navbar_height: 51px
         right: 0
         bottom: $navbar_height
         left: 0
-        width: $ace_width
         .ace_gutter
             cursor: ew-resize
     &.oe_ace_open
-- 
cgit v1.2.3


From 24c3e4016b428b69dc70a22598ea30b5eca9416e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 11:51:58 +0200
Subject: [IMP] Ace: light opacity trick

bzr revid: ddm@openerp.com-20131021095158-6037xha2bqyihv0q
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 092194e9e10..dcfa88b89e7 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -503,7 +503,7 @@ $navbar_height: 51px
         .ace_gutter
             cursor: ew-resize
     &.oe_ace_open
-        +opacity(1)
+        +opacity(0.97)
     &.oe_ace_closed
         z-index: -1000
         +opacity(0)
-- 
cgit v1.2.3


From 649585110224726ad8eafdda992fd5fbabf2a52a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 Oct 2013 10:15:01 +0200
Subject: [ADD] UI improvement: Translate "or Edit Master"

bzr revid: fme@openerp.com-20131023081501-f9owb501j16757bk
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index dcfa88b89e7..e4ef24dad70 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -106,6 +106,9 @@ table.editorbar-panel
         background-color: #b1c9d9
 
 // ---- TRANSLATIONS ---- {{{
+.oe_translate_or
+    color: white
+    padding: 0 0.2em
 .oe_translate_examples li
     margin: 10px
     padding: 4px
-- 
cgit v1.2.3


From 1ce3230d135b03be09406e7c587ae3477eafb44b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Oct 2013 15:09:18 +0200
Subject: [IMP] don't completely wedge the RTE in case save fails. This may
 well break snippets entirely in case of save failure.

bzr revid: xmo@openerp.com-20131023130918-j5s81t0j60gitr1t
---
 addons/website/static/src/css/editor.sass | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e4ef24dad70..5dbe7a8eee9 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -154,6 +154,10 @@ table.editorbar-panel
     content: " "
     white-space: pre-wrap
 
+.oe_carlos_danger
+    outline: 1px solid red !important
+    background-color: #ffd9dd !important
+
 /* ---- SNIPPET EDITOR ---- */
 
 #oe_snippets
-- 
cgit v1.2.3


From 2d0158d8cc96a6bae52039b3158913c85a1d5162 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 Oct 2013 09:37:18 +0100
Subject: [ADD] Menu drag'n dro

bzr revid: fme@openerp.com-20131029083718-e6jrinmh6z48vn5j
---
 addons/website/static/src/css/editor.sass | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 5dbe7a8eee9..ca60d7e474a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -124,6 +124,35 @@ table.editorbar-panel
     background: rgb(255, 255, 182)
 // }}}
 
+// -------- MENU -------- {{{
+body.dragging, body.dragging *
+    cursor: move !important
+
+.dragged
+    position: absolute
+    top: 0
+    opacity: .5
+    z-index: 2000
+
+ul#top_menu
+    li.placeholder
+        position: relative
+        margin: 0
+        padding: 0
+        border: none
+        &:before
+            position: absolute
+            content: ""
+            width: 0
+            height: 0
+            margin-top: -5px
+            left: -5px
+            top: -4px
+            border: 5px solid transparent
+            border-left-color: #990000
+            border-right: none
+// }}}
+
 /* ---- RTE ---- */
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
-- 
cgit v1.2.3


From 7ac3061c42428c3650374901420b12c14da55d6b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 Oct 2013 12:24:50 +0100
Subject: [WIP] Edit menu dialog

bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
---
 addons/website/static/src/css/editor.sass | 90 +++++++++++++++++++++++--------
 1 file changed, 67 insertions(+), 23 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ca60d7e474a..91fcc25cfe4 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -125,32 +125,76 @@ table.editorbar-panel
 // }}}
 
 // -------- MENU -------- {{{
-body.dragging, body.dragging *
-    cursor: move !important
+ul.oe_menu_editor
+    &, & ul
+        list-style-type: none
+        margin: 0
+        padding: 0
+    & ul
+        padding-left: 30px
 
-.dragged
-    position: absolute
-    top: 0
-    opacity: .5
-    z-index: 2000
+    button
+        margin-left: 4px
 
-ul#top_menu
-    li.placeholder
-        position: relative
-        margin: 0
+    li
+        margin: 5px 0 0 0
         padding: 0
-        border: none
-        &:before
-            position: absolute
-            content: ""
-            width: 0
-            height: 0
-            margin-top: -5px
-            left: -5px
-            top: -4px
-            border: 5px solid transparent
-            border-left-color: #990000
-            border-right: none
+
+    .oe_menu_placeholder
+        outline: 1px dashed #4183C4
+
+    .mjs-nestedSortable-error
+        background: #fbe3e4
+        border-color: transparent
+
+
+    // TODO: use compass mixins
+    li div
+        border: 1px solid #d4d4d4
+        -webkit-border-radius: 3px
+        -moz-border-radius: 3px
+        border-radius: 3px
+        border-color: #D4D4D4 #D4D4D4 #BCBCBC
+        padding: 6px
+        margin: 0
+        cursor: move
+        background: #f6f6f6
+        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #ededed 100%)
+        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed))
+        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
+        background: -o-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
+        background: -ms-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
+        background: linear-gradient(to bottom,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
+        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 )
+
+    li.mjs-nestedSortable-branch div
+        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #f0ece9 100%)
+        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#f0ece9 100%)
+
+    li.mjs-nestedSortable-leaf div
+        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #bcccbc 100%)
+        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#bcccbc 100%)
+
+    li.mjs-nestedSortable-collapsed.mjs-nestedSortable-hovering div
+        border-color: #999
+        background: #fafafa
+
+    .disclose
+        cursor: pointer
+        width: 10px
+        display: none
+
+    li.mjs-nestedSortable-collapsed > ul
+        display: none
+
+    li.mjs-nestedSortable-branch > div > .disclose
+        display: inline-block
+
+    li.mjs-nestedSortable-collapsed > div > .disclose > span:before
+        content: '+ '
+
+    li.mjs-nestedSortable-expanded > div > .disclose > span:before
+        content: '- '
 // }}}
 
 /* ---- RTE ---- */
-- 
cgit v1.2.3


From 418e10c382cb0354c85fa62b41ce2cee7f3c0b54 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 15:02:16 +0100
Subject: [IMP] Misc menu improvements

bzr revid: fme@openerp.com-20131030140216-f2fz7p3waur3l8j7
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 91fcc25cfe4..052e473d484 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -125,6 +125,9 @@ table.editorbar-panel
 // }}}
 
 // -------- MENU -------- {{{
+div.oe_menu_buttons
+    top: -8px
+    right: -8px
 ul.oe_menu_editor
     &, & ul
         list-style-type: none
-- 
cgit v1.2.3


From cf58fd485b848bba138a202aa50d7e5247b819a4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 Oct 2013 18:34:28 +0100
Subject: [IMP] first menu becomes root url

bzr revid: fme@openerp.com-20131031173428-c6l8b19ig5npwb9i
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 052e473d484..9f6a1b15170 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,6 +129,8 @@ div.oe_menu_buttons
     top: -8px
     right: -8px
 ul.oe_menu_editor
+    > li:first-child > div > i:before
+        content: "\f015"
     &, & ul
         list-style-type: none
         margin: 0
-- 
cgit v1.2.3


From 843e16e57ed0b9295114726b9f31731ad434c990 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Nov 2013 09:07:43 +0100
Subject: [IMP] Small layout improvements

bzr revid: fp@tinyerp.com-20131105080743-jy5ee76500dhh923
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 9f6a1b15170..7ec41b2e760 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -108,7 +108,7 @@ table.editorbar-panel
 // ---- TRANSLATIONS ---- {{{
 .oe_translate_or
     color: white
-    padding: 0 0.2em
+    padding: 0 0 0 1em
 .oe_translate_examples li
     margin: 10px
     padding: 4px
-- 
cgit v1.2.3


From 20899155c5881f2ca1a576b01fb68da876e6e2a9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 6 Nov 2013 16:24:12 +0100
Subject: [IMP] during image upload, disable save button

hide it and replace it with a button telling the user what we're
currently doing (uploading the image).

Leave the possibility of discarding the whole thing and going away
though.

bzr revid: xmo@openerp.com-20131106152412-eb283vghb18aafyr
---
 addons/website/static/src/css/editor.sass | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7ec41b2e760..f7ca4dc8cd2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -219,6 +219,13 @@ ul.oe_menu_editor
 .modal .image-preview
     margin-bottom: 0.5em
 
+.modal.nosave .modal-footer
+    button.save
+        display: none
+    button.wait
+        display: inline-block !important
+        visibility: visible !important
+
 // wrapper positioned relatively for drag&drop widget which is disabled below.
 // Breaks completely horribly crazy products listing page, so take it out.
 .cke_widget_wrapper
-- 
cgit v1.2.3


From cf5dfe897e98e7659c854f9ca0926a12ef9ff16d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Nov 2013 22:11:32 +0100
Subject: [IMP] Menu editor: home icon on right

bzr revid: fme@openerp.com-20131114211132-bjrkreuy9b0fhqey
---
 addons/website/static/src/css/editor.sass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f7ca4dc8cd2..da1bc7a70ef 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -129,7 +129,9 @@ div.oe_menu_buttons
     top: -8px
     right: -8px
 ul.oe_menu_editor
-    > li:first-child > div > i:before
+    .icon-home:before
+        content: " "
+    > li:first-child > div > i.icon-home:before
         content: "\f015"
     &, & ul
         list-style-type: none
-- 
cgit v1.2.3


From 14edb56bb3623f4966dc18b866bd0abe0ab6f218 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Nov 2013 12:51:22 +0100
Subject: [IMP] CSS cleaning: edit menu

bzr revid: fp@tinyerp.com-20131115115122-zzg6xeisa85n45e1
---
 addons/website/static/src/css/editor.sass | 71 +++----------------------------
 1 file changed, 7 insertions(+), 64 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index da1bc7a70ef..918714ea92f 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -128,80 +128,23 @@ table.editorbar-panel
 div.oe_menu_buttons
     top: -8px
     right: -8px
-ul.oe_menu_editor
-    .icon-home:before
-        content: " "
-    > li:first-child > div > i.icon-home:before
-        content: "\f015"
-    &, & ul
-        list-style-type: none
-        margin: 0
-        padding: 0
-    & ul
-        padding-left: 30px
-
-    button
-        margin-left: 4px
-
-    li
-        margin: 5px 0 0 0
-        padding: 0
 
+ul.oe_menu_editor
+    .icon-home
+        display: none
+    > li:first-child .icon-home
+        display: block
     .oe_menu_placeholder
         outline: 1px dashed #4183C4
-
-    .mjs-nestedSortable-error
-        background: #fbe3e4
-        border-color: transparent
-
-
-    // TODO: use compass mixins
+    ul
+        list-style: none
     li div
-        border: 1px solid #d4d4d4
-        -webkit-border-radius: 3px
-        -moz-border-radius: 3px
-        border-radius: 3px
-        border-color: #D4D4D4 #D4D4D4 #BCBCBC
-        padding: 6px
-        margin: 0
         cursor: move
-        background: #f6f6f6
-        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #ededed 100%)
-        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed))
-        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        background: -o-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        background: -ms-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        background: linear-gradient(to bottom,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 )
-
-    li.mjs-nestedSortable-branch div
-        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #f0ece9 100%)
-        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#f0ece9 100%)
-
-    li.mjs-nestedSortable-leaf div
-        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #bcccbc 100%)
-        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#bcccbc 100%)
-
-    li.mjs-nestedSortable-collapsed.mjs-nestedSortable-hovering div
-        border-color: #999
-        background: #fafafa
-
     .disclose
         cursor: pointer
         width: 10px
         display: none
 
-    li.mjs-nestedSortable-collapsed > ul
-        display: none
-
-    li.mjs-nestedSortable-branch > div > .disclose
-        display: inline-block
-
-    li.mjs-nestedSortable-collapsed > div > .disclose > span:before
-        content: '+ '
-
-    li.mjs-nestedSortable-expanded > div > .disclose > span:before
-        content: '- '
 // }}}
 
 /* ---- RTE ---- */
-- 
cgit v1.2.3


From 3a3f7fbc1537b9f3be18bd5dec3c8ba46b8ce67d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 18 Nov 2013 10:58:59 +0100
Subject: [FIX] menu css: narrower selector for icon-home in order to avoid
 children propagation

bzr revid: fme@openerp.com-20131118095859-jizw6limr2b67xyt
---
 addons/website/static/src/css/editor.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 918714ea92f..3896ced8648 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -132,7 +132,7 @@ div.oe_menu_buttons
 ul.oe_menu_editor
     .icon-home
         display: none
-    > li:first-child .icon-home
+    > li:first-child > div > span > .icon-home
         display: block
     .oe_menu_placeholder
         outline: 1px dashed #4183C4
-- 
cgit v1.2.3


From aa2208f580d1b189b9cf2d79cea72b4694f0da3d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 20 Nov 2013 13:44:51 +0100
Subject: [IMP] sass/compass use in website.sass

bzr revid: xmo@openerp.com-20131120124451-25m26kao051x6tam
---
 addons/website/static/src/css/editor.sass | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3896ced8648..ea7bbb1480a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,19 +1,6 @@
 @charset "utf-8"
 
-@import "compass/css3"
-@import "compass/css3/user-interface"
-@import "compass/css3/transition"
-
-//smartphones, iPhone, portrait 480x320 phones
-$smart_phone: 320px
-//portrait e-readers (Nook/Kindle), smaller tablets @ 600 or @ 640 wide.*/
-$small-tablet: 481px
-//portrait tablets, portrait iPad, landscape e-readers, landscape 800x480 or 854x480 phones
-$portrait-tablet: 641px
-//tablet, landscape iPad, lo-res laptops ands desktops
-$tablet: 961px
-//big landscape tablets, laptops, and desktops
-$desktop: 1025px
+@import "common"
 
 /* ---- CKEditor Minimal Reset ---- */
 
@@ -303,7 +290,7 @@ ul.oe_menu_editor
         position: relative
         margin: 0px -24px !important
     &.oe_overlay
-        border-radius: 3px
+        +border-radius(3px)
         //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
         //background-size: 100px 100px
         background: rgba(153, 0, 255,.5)
@@ -507,10 +494,6 @@ $editorbar_height: 30px
 // TODO Fix => might break with themes
 $navbar_height: 51px
 
-@mixin editor-font
-    font-size: 14px
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace
-    line-height: normal
 .oe_ace_view_editor
     position: fixed
     top: $navbar_height
-- 
cgit v1.2.3


From 20a0119ed630b4375723f0b74f4e9ae7c2bc75d4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 28 Nov 2013 15:36:46 +0100
Subject: [IMP] website: hide publish/edit button on editable mode

bzr revid: chm@openerp.com-20131128143646-fl3okv6wisqio8xq
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ea7bbb1480a..1e35c352374 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -70,6 +70,9 @@
 .css_non_editable_mode_hidden
     display: none
 
+.cke_editable .css_editable_mode_hidden
+    display: none
+
 .oe_carousel_options
     cursor: pointer
     position: absolute
-- 
cgit v1.2.3


From 78dedf2dff12fa659fc864bbf699c9c468022db2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 3 Dec 2013 11:04:49 +0100
Subject: [IMP] website snippet: icones goto parent snippet, clean css,
 unactive snippet when click outside

bzr revid: chm@openerp.com-20131203100449-7ups314ffru0kobh
---
 addons/website/static/src/css/editor.sass | 108 ++++++++++++++++--------------
 1 file changed, 57 insertions(+), 51 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 1e35c352374..2c775be3b04 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -331,37 +331,66 @@ ul.oe_menu_editor
         border-width: 1px
         +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset)
         border-color: rgba(0, 0, 0, 0.5)
-        .oe_handle
-            display: block !important
-            pointer-events: auto
-            &:before
-                position: relative
-                top: 50%
-                left: 50%
-                display: block
-                background: rgba(255, 255, 255, 1)
-                border: solid 1px rgba(0, 0, 0, .2)
-                +border-radius(5px)
-                width: 18px
-                height: 18px
-                margin: -9px
-                padding-left: 1px
-                font-size: 14px
-                line-height: 14px
-                font-family: FontAwesome
-                color: rgba(0,0,0,.5)
-                @include transition(background 100ms linear)
-            &:hover:before
-                background: rgba(0, 0, 0, .5)
-                color: #fff
-                +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
-        .oe_handle.e:before
+    .oe_handle
+        display: block !important
+        pointer-events: auto
+        position: absolute
+        top: 50%
+        left: 50%
+        +box-sizing(border-box)
+        width: 12px
+        height: 12px
+        margin: -2px
+        &:before
+            position: relative
+            top: 50%
+            left: 50%
+            display: block
+            background: rgba(255, 255, 255, 1)
+            border: solid 1px rgba(0, 0, 0, .2)
+            +border-radius(5px)
+            width: 18px
+            height: 18px
+            margin: -9px
+            padding-left: 1px
+            font-size: 14px
+            line-height: 14px
+            font-family: FontAwesome
+            color: rgba(0,0,0,.5)
+            @include transition(background 100ms linear)
+        &:hover:before
+            background: rgba(0, 0, 0, .5)
+            color: #fff
+            +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+    .oe_handle.e
+        left: auto
+        top: 2px
+        height: 100%
+        right: -4px
+        cursor: w-resize
+        &:before
             content: "\F061"
-        .oe_handle.s:before
+    .oe_handle.s
+        top: auto
+        left: 2px
+        width: 100%
+        bottom: -4px
+        cursor: n-resize
+        &:before
             content: "\F063"
-        .oe_handle.w:before
+    .oe_handle.w
+        top: 2px
+        height: 100%
+        left: -4px
+        cursor: e-resize
+        &:before
             content: "\F060"
-        .oe_handle.n:before
+    .oe_handle.n
+        left: 2px
+        width: 100%
+        top: -4px
+        cursor: s-resize
+        &:before
             content: "\F062"
 
     .icon.btn
@@ -395,29 +424,6 @@ ul.oe_menu_editor
     height: 8px
     margin: -4px
 
-.oe_handle.n
-    left: 2px
-    width: 100%
-    top: 0px
-    cursor: s-resize
-.oe_handle.e
-    left: auto
-    top: 2px
-    height: 100%
-    right: 0px
-    cursor: w-resize
-.oe_handle.s
-    top: auto
-    left: 2px
-    width: 100%
-    bottom: 0px
-    cursor: n-resize
-.oe_handle.w
-    top: 2px
-    height: 100%
-    left: 0px
-    cursor: e-resize
-
 .s-resize-important, .s-resize-important *
     cursor: s-resize !important
 .n-resize-important, .n-resize-important *
-- 
cgit v1.2.3


From 950f7495b597cc685c23641d6b52b5eceef83a74 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Dec 2013 11:21:58 +0100
Subject: [IMP] remove pager buttons instead of disabling them if no
 previous/next page

bzr revid: xmo@openerp.com-20131203102158-j9w9gkceyzec6ats
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 2c775be3b04..cb0876d4212 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -161,6 +161,9 @@ ul.oe_menu_editor
         display: inline-block !important
         visibility: visible !important
 
+.existing-attachments .pager .disabled
+    display: none
+
 // wrapper positioned relatively for drag&drop widget which is disabled below.
 // Breaks completely horribly crazy products listing page, so take it out.
 .cke_widget_wrapper
-- 
cgit v1.2.3


From 9a3eb7963601e019aa02a0e8628984f445a8cebb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 3 Dec 2013 14:51:56 +0100
Subject: [FIX] new fa icons for menu

bzr revid: fme@openerp.com-20131203135156-vflspcfkitv667wv
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index cb0876d4212..b44b7c6a4e9 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -120,9 +120,9 @@ div.oe_menu_buttons
     right: -8px
 
 ul.oe_menu_editor
-    .icon-home
+    .fa-home
         display: none
-    > li:first-child > div > span > .icon-home
+    > li:first-child > div > span > .fa-home
         display: block
     .oe_menu_placeholder
         outline: 1px dashed #4183C4
-- 
cgit v1.2.3


From b79e56d1af9a2d9e10631df79c4325ea7d0854e1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 Dec 2013 11:52:12 +0100
Subject: [IMP] clarity of links edition

According to user tests, users have a hard time finding out how to
edit links. Thus, add same system as image edition (a small button
appearing when hovering the element).

Extract and unify these two to avoid redundancies between handlings as
they are broadly similar (only details such as label, positioning and
size of button relative to the element being hovered really change,
the lifecycle itself is the same).

The main setup still isn't very clean, there might be a better way to
do it.

bzr revid: xmo@openerp.com-20131204105212-u0a49nbvwilgtfst
---
 addons/website/static/src/css/editor.sass | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index b44b7c6a4e9..7de48fdc611 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -181,6 +181,12 @@ ul.oe_menu_editor
     outline: 1px solid red !important
     background-color: #ffd9dd !important
 
+.hover-edition-button
+    position: absolute
+    top: 0
+    left: 0
+    z-index: 42
+
 /* ---- SNIPPET EDITOR ---- */
 
 #oe_snippets
-- 
cgit v1.2.3


From 04045c369931ea0c4359ddff0196c163dc5e6db5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 Dec 2013 17:28:05 +0100
Subject: [IMP] use ckeditor 4.3 final feature to disable widget draghandle
 entirely instead of relying on CSS

bzr revid: xmo@openerp.com-20131204162805-rikk5kbbx304tol6
---
 addons/website/static/src/css/editor.sass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7de48fdc611..885b1c9372c 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -168,9 +168,6 @@ ul.oe_menu_editor
 // Breaks completely horribly crazy products listing page, so take it out.
 .cke_widget_wrapper
     position: static !important
-// "remove" drag & drop of CKE widgets
-.cke_widget_drag_handler_container
-    display: none !important
 // prevent inline widgets from entirely disappearing when their (textual)
 // content is removed
 .cke_widget_editable:empty:after
-- 
cgit v1.2.3


From b0c4ae43ac6ddcfc59d9dccf90aeee01409a664f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 11 Dec 2013 16:36:46 +0100
Subject: [FIX] My humble participation to the great World War Z-index

bzr revid: fme@openerp.com-20131211153646-an990cc99t08f534
---
 addons/website/static/src/css/editor.sass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 885b1c9372c..d40ef97755e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -182,7 +182,8 @@ ul.oe_menu_editor
     position: absolute
     top: 0
     left: 0
-    z-index: 42
+    // This z-index is due to .navbar of bootstrap
+    z-index: 1000
 
 /* ---- SNIPPET EDITOR ---- */
 
-- 
cgit v1.2.3


From 083e88167e5c376a9559e6c38fd3af193266ff2f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Dec 2013 17:33:05 +0100
Subject: [IMP] website: save (button) or discard (link), on left in modal

bzr revid: chm@openerp.com-20131211163305-5qwltn11k2ph179o
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d40ef97755e..c2bc7a43dfa 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -154,6 +154,9 @@ ul.oe_menu_editor
 .modal .image-preview
     margin-bottom: 0.5em
 
+.modal-footer
+    text-align: left
+
 .modal.nosave .modal-footer
     button.save
         display: none
-- 
cgit v1.2.3


From f6eb40fc90802526161d051ddef7dd1582324f16 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 Dec 2013 11:47:02 +0100
Subject: [FIX] enable user-selection on editable buttons (when the button
 itself is editable, not just in an editable section)

bzr revid: xmo@openerp.com-20131217104702-jell0imowvzjlasl
---
 addons/website/static/src/css/editor.sass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c2bc7a43dfa..38b1d9f3436 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -141,8 +141,8 @@ ul.oe_menu_editor
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
 // about them either
-.oe_editable .btn
-    @include user-select(auto)
+.oe_editable .btn, .btn.oe_editable
+    +user-select(auto)
 
 .modal-dialog.select-image
     width: 80%
-- 
cgit v1.2.3


From 90a9e522f3190a314fca289066943f312cd637f3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 18 Dec 2013 12:49:01 +0100
Subject: [ADD] placeholder support on t-field

A placeholder is looked up:

1. in the field's options ("placeholder")
2. on the t-field node itself (@placeholder)
3. on the field's column (.placeholder)

The first one found is used as the @placeholder of the resulting node
(in-HTML), and displayed when the field is empty and unfocused.

If no placeholder is found, an empty field just gets a small padding
in order to be easier to see & focus.

bzr revid: xmo@openerp.com-20131218114901-xi3ye11x5pysq2a2
---
 addons/website/static/src/css/editor.sass | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 38b1d9f3436..ff62f416d8d 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -171,11 +171,20 @@ ul.oe_menu_editor
 // Breaks completely horribly crazy products listing page, so take it out.
 .cke_widget_wrapper
     position: static !important
+
 // prevent inline widgets from entirely disappearing when their (textual)
 // content is removed
-.cke_widget_editable:empty:after
-    content: " "
-    white-space: pre-wrap
+.cke_widget_editable
+    // basic config
+    &:empty:after
+        opacity: 0.3
+        white-space: pre-wrap
+    // no @placeholder -> just add some padding
+    &:not([placeholder]):empty::after
+        content: " "
+    // with placeholder and when not (yet) focused -> display placeholder
+    &[placeholder]:not(:focus):empty::after
+        content: attr(placeholder)
 
 .oe_carlos_danger
     outline: 1px solid red !important
-- 
cgit v1.2.3


From 9abcc28884688bd251c5a9de77b3afda11dcec90 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Dec 2013 18:39:15 +0100
Subject: [IMP] Set EditorBar height programmatically

bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf
---
 addons/website/static/src/css/editor.sass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ff62f416d8d..031dd85c9f5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -203,7 +203,7 @@ ul.oe_menu_editor
     position: fixed
     left: 0px
     right: 0px
-    top: 51px
+    // top property is set programmatically
     background: rgb(40,40,40)
     +box-shadow(0px 10px 10px -10px black inset)
     z-index: 1010
@@ -520,11 +520,10 @@ $highlighted_text_color: #ffffff
 
 $editorbar_height: 30px
 // TODO Fix => might break with themes
-$navbar_height: 51px
 
 .oe_ace_view_editor
     position: fixed
-    top: $navbar_height
+    // top property is set programmatically
     right: 0
     z-index: 1000
     height: 100%
@@ -546,7 +545,7 @@ $navbar_height: 51px
         position: absolute
         top: $editorbar_height
         right: 0
-        bottom: $navbar_height
+        // bottom property is set programmatically
         left: 0
         .ace_gutter
             cursor: ew-resize
-- 
cgit v1.2.3


From 375e440c2efc5dfd623885677154f06c323d8421 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 19 Dec 2013 10:33:29 +0100
Subject: [ADD] Markers for vim

bzr revid: fme@openerp.com-20131219093329-s5oumfhwyw0pevfy
---
 addons/website/static/src/css/editor.sass | 54 ++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 15 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 031dd85c9f5..e6beac3e35a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,8 +1,6 @@
-@charset "utf-8"
-
 @import "common"
 
-/* ---- CKEditor Minimal Reset ---- */
+/* ---- CKEditor Minimal Reset ---- {{{ */
 
 .navbar.navbar-inverse .cke_chrome
     border: none
@@ -26,7 +24,9 @@
     border: none
     +box-shadow(none)
 
-/* ---- OpenERP Style ---- */
+// }}}
+
+/* ---- OpenERP Style ---- {{{ */
 
 .oe_website_editorbar
     position: fixed
@@ -85,7 +85,9 @@
         position: relative !important
         top: +2px
 
-/* ---- EDITOR BAR ---- */
+// }}}
+
+/* ---- EDITOR BAR ---- {{{ */
 
 table.editorbar-panel
     cursor: pointer
@@ -95,7 +97,10 @@ table.editorbar-panel
     td.selected
         background-color: #b1c9d9
 
-// ---- TRANSLATIONS ---- {{{
+// }}}
+
+/* ---- TRANSLATIONS ---- {{{ */
+
 .oe_translate_or
     color: white
     padding: 0 0 0 1em
@@ -112,9 +117,11 @@ table.editorbar-panel
     padding: 0 10px
 .oe_translatable_todo
     background: rgb(255, 255, 182)
+
 // }}}
 
-// -------- MENU -------- {{{
+/* ---- MENU ---- {{{ */
+
 div.oe_menu_buttons
     top: -8px
     right: -8px
@@ -137,7 +144,7 @@ ul.oe_menu_editor
 
 // }}}
 
-/* ---- RTE ---- */
+/* ---- RTE ---- {{{ */
 
 // bootstrap makes .btn elements unselectable -> RTE double-click can't know
 // about them either
@@ -197,7 +204,9 @@ ul.oe_menu_editor
     // This z-index is due to .navbar of bootstrap
     z-index: 1000
 
-/* ---- SNIPPET EDITOR ---- */
+// }}}
+
+/* ---- SNIPPET EDITOR ---- {{{ */
 
 #oe_snippets
     position: fixed
@@ -286,7 +295,9 @@ ul.oe_menu_editor
 #oe_snippets .oe_snippet_thumbnail
     @include background(#747474, radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4)))
 
-/* ---- SNIPPETS DROP ZONES ---- */
+// }}}}
+
+/* ---- SNIPPETS DROP ZONES ---- {{{ */
 
 .oe_drop_zone.oe_insert
     display: block
@@ -333,7 +344,9 @@ ul.oe_menu_editor
     margin-bottom: 32px
     padding-top: 12px
 
-/* ---- SNIPPET MANIPULATOR ---- */
+// }}}
+
+/* ---- SNIPPET MANIPULATOR ---- {{{ */
 
 .oe_overlay
     display: none
@@ -454,8 +467,9 @@ ul.oe_menu_editor
 .move-important, .move-important *
     cursor: move !important
 
+// }}}
 
-/* ---- MOBILE PREVIEW ---- */
+/* ---- MOBILE PREVIEW ---- {{{ */
 
 $mobile_preview_background: #000000
 $mobile_preview_border: #1C1F1F
@@ -498,7 +512,9 @@ $icon_close: #E00101
         .modal-footer
             background-color: $mobile_preview_background
 
-/* ---- SEO TOOLS ---- */
+// }}}
+
+/* ---- SEO TOOLS ---- {{{ */
 
 $remove_color: $icon_close
 $in_title_color: #5cb85c
@@ -516,7 +532,9 @@ $highlighted_text_color: #ffffff
         padding: .2em .4em .2em .5em
         +border-radius(.4em)
 
-/* ---- ACE EDITOR ---- */
+// }}}
+
+/* ---- ACE EDITOR ---- {{{ */
 
 $editorbar_height: 30px
 // TODO Fix => might break with themes
@@ -555,9 +573,15 @@ $editorbar_height: 30px
         z-index: -1000
         +opacity(0)
 
-/* ---- EDITOR TOUR ---- */
+// }}}
+
+/* ---- EDITOR TOUR ---- {{{ */
+
 div.tour-backdrop
     z-index: 2009
 .popover.tour
     z-index: 2010
+
+// }}}
+
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
-- 
cgit v1.2.3


From af1e65ffdb72c709b7c1dc0fad825178e278ef56 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 19 Dec 2013 10:34:10 +0100
Subject: [IMP] Use cursor: text for editable .btn's

bzr revid: fme@openerp.com-20131219093410-lgr1f54nehaz9fk0
---
 addons/website/static/src/css/editor.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e6beac3e35a..6cc590bf6b2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -150,6 +150,7 @@ ul.oe_menu_editor
 // about them either
 .oe_editable .btn, .btn.oe_editable
     +user-select(auto)
+    cursor: text !important
 
 .modal-dialog.select-image
     width: 80%
-- 
cgit v1.2.3


From 7b5f713c93e842ffebac50432b6c6c425c6922af Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 31 Dec 2013 11:13:38 +0100
Subject: [FIX] Fixed popovers in banner tour

bzr revid: ddm@openerp.com-20131231101338-91q7yt5d62joldwd
---
 addons/website/static/src/css/editor.sass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 6cc590bf6b2..9def6bc7127 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -582,6 +582,8 @@ div.tour-backdrop
     z-index: 2009
 .popover.tour
     z-index: 2010
+.popover.fixed
+    position: fixed
 
 // }}}
 
-- 
cgit v1.2.3


From 3d96b4c2a38cc117068c89d55a7c2c21202752a5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 8 Jan 2014 13:21:13 +0100
Subject: [IMP] website: snippets: add resize bar on snippet overlay; resising
 % 8px; remove size class

bzr revid: chm@openerp.com-20140108122113-d2zcyaobkahixlpa
---
 addons/website/static/src/css/editor.sass | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 9def6bc7127..78af810448f 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -349,6 +349,8 @@ ul.oe_menu_editor
 
 /* ---- SNIPPET MANIPULATOR ---- {{{ */
 
+.resize_editor_busy
+    background-color: rgba(0,0,0,0.3)
 .oe_overlay
     display: none
     position: absolute
@@ -403,7 +405,7 @@ ul.oe_menu_editor
         cursor: w-resize
         &:before
             content: "\F061"
-    .oe_handle.s
+    .oe_handle.s, .oe_handle.size
         top: auto
         left: 2px
         width: 100%
@@ -411,6 +413,16 @@ ul.oe_menu_editor
         cursor: n-resize
         &:before
             content: "\F063"
+    .oe_handle.size
+        border-style: dashed
+        border-width: 0 0 1px 0
+        border-color: rgba(0, 0, 0, 0.5)
+        &:before
+            content: "Resize"
+            width: 64px
+            text-align: center
+            margin-left: -32px
+            margin-top: -4px
     .oe_handle.w
         top: 2px
         height: 100%
-- 
cgit v1.2.3


From dac3058100b29d961908fa40b4e082049ceaab5c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 17:04:34 +0100
Subject: [IMP] website: This page is under construction

bzr revid: chm@openerp.com-20140114160434-wukbj48ope1twhja
---
 addons/website/static/src/css/editor.sass | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 78af810448f..0ea928dba86 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -85,6 +85,12 @@
         position: relative !important
         top: +2px
 
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
+    background-image: url('/website/static/src/img/edit_here.png') !important
+
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
+    content: 'Press The Top-Left Edit Button' !important
+
 // }}}
 
 /* ---- EDITOR BAR ---- {{{ */
-- 
cgit v1.2.3


From 45feba1f864565f01919f37c9411ac71b7c178ae Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 17:29:25 +0100
Subject: [IMP]website_sale: no product message for public users

bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 0ea928dba86..66665252379 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -67,6 +67,9 @@
 .oe_editable:focus
     outline: none !important
 
+.css_editable_display
+    display: block !important
+
 .css_non_editable_mode_hidden
     display: none
 
-- 
cgit v1.2.3


From fd14481dd34aab6536f11f18892a04cae726ed66 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 15 Jan 2014 13:59:23 +0100
Subject: [IMP] website snippet: create snippets.sass, imrpove css and resizing
 layout

bzr revid: chm@openerp.com-20140115125923-eggv51bsvokc7a06
---
 addons/website/static/src/css/editor.sass | 275 ------------------------------
 1 file changed, 275 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 66665252379..e3e3f27166b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -216,281 +216,6 @@ ul.oe_menu_editor
 
 // }}}
 
-/* ---- SNIPPET EDITOR ---- {{{ */
-
-#oe_snippets
-    position: fixed
-    left: 0px
-    right: 0px
-    // top property is set programmatically
-    background: rgb(40,40,40)
-    +box-shadow(0px 10px 10px -10px black inset)
-    z-index: 1010
-    overflow: hidden
-    &:hover
-        height: auto
-    .scroll
-        white-space: nowrap
-        overflow-y: none
-    .nav
-        display: inline-block
-        border-bottom: none !important
-        vertical-align: middle
-        min-width: 120px
-        > li
-            display: block
-            float: none
-            &.active
-                background: black !important
-            > a
-                padding: 2px 10px !important
-                width: 100%
-                display: block
-                border: 0
-        z-index: 1
-    .pill-content
-        border: 0
-    .tab-content
-        display: inline-block
-        white-space: nowrap
-        background: black
-        > div
-            background: rgb(0,0,0)
-            label
-                width: 44px
-                color: #fff
-                padding-left: 10px
-
-                div
-                    width: 100px
-                    text-align: center
-                    @include transform( translate(-39px, 44px) , rotate(-90deg) )
-                    @include transform-origin(50% 50%)
-
-.oe_snippet
-    float: left
-    vertical-align: top
-    width: 93px
-    margin-left: 1px
-    margin-top: 0px
-    position: relative
-    overflow: hidden
-    +user-select(none)
-    cursor: move
-    pointer-events: none
-    .oe_snippet_thumbnail
-        pointer-events: auto
-        text-align: center
-        height: 100%
-        background: transparent
-        color: white
-        position: relative
-        &:hover
-            .oe_snippet_thumbnail_img
-                @include transform( scale(.95,.95))
-        .oe_snippet_thumbnail_title
-            font-size: 12px
-            display: block
-            +text-shadow(0 0 2px rgb(0,0,0))
-        .oe_snippet_thumbnail_img
-            height: 74px
-            @include transition(all 150ms linear)
-            +box-shadow(inset 0px 0px 0px 3px #333333)
-            @include transform( scale(1,1))
-        span, div
-            line-height: 18px
-    & > :not(.oe_snippet_thumbnail)
-        display: none !important
-
-#oe_snippets .oe_snippet_thumbnail
-    @include background(#747474, radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4)))
-
-// }}}}
-
-/* ---- SNIPPETS DROP ZONES ---- {{{ */
-
-.oe_drop_zone.oe_insert
-    display: block
-    height: 48px
-    margin: 0px
-    margin-top: -4px
-    margin-bottom: -44px
-    @include transition(margin 250ms linear)
-    width: 100%
-    position: absolute
-    z-index: 1000
-    &:not(.oe_vertical):before
-        content: ""
-        display: block
-        border-top: dashed 2px rgba(209, 178, 255, 0.72)
-        position: relative
-        top: 0px
-    &.oe_hover:before
-        border-top: dashed 2px rgba(116, 255, 161, 0.72)
-    &.oe_vertical
-        width: 48px
-        float: left
-        position: relative
-        margin: 0px -24px !important
-    &.oe_overlay
-        +border-radius(3px)
-        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
-        //background-size: 100px 100px
-        background: rgba(153, 0, 255,.5)
-
-.oe_drop_zone, .oe_drop_zone_style
-    border: none
-    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
-    //background-size: 100px 100px
-    background: rgba(153, 0, 255, .3)
-    +border-radius(4px)
-    &.oe_hover
-        background: rgba(0, 255, 133, .3)
-        z-index: 1001
-
-.oe_drop_zone_style
-    color: white
-    height: 48px
-    margin-bottom: 32px
-    padding-top: 12px
-
-// }}}
-
-/* ---- SNIPPET MANIPULATOR ---- {{{ */
-
-.resize_editor_busy
-    background-color: rgba(0,0,0,0.3)
-.oe_overlay
-    display: none
-    position: absolute
-    background: transparent
-    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.02) ,rgba(255,255,255,.02) 35px, rgba(0,0,0,.02) 35px, rgba(0,0,0,.02) 75px))
-    +border-radius(3px)
-    @include transition(opacity 100ms linear)
-    +box-sizing(border-box)
-    pointer-events: none
-    &.oe_active
-        display: block
-        border-style: dashed
-        border-width: 1px
-        +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset)
-        border-color: rgba(0, 0, 0, 0.5)
-    .oe_handle
-        display: block !important
-        pointer-events: auto
-        position: absolute
-        top: 50%
-        left: 50%
-        +box-sizing(border-box)
-        width: 12px
-        height: 12px
-        margin: -2px
-        &:before
-            position: relative
-            top: 50%
-            left: 50%
-            display: block
-            background: rgba(255, 255, 255, 1)
-            border: solid 1px rgba(0, 0, 0, .2)
-            +border-radius(5px)
-            width: 18px
-            height: 18px
-            margin: -9px
-            padding-left: 1px
-            font-size: 14px
-            line-height: 14px
-            font-family: FontAwesome
-            color: rgba(0,0,0,.5)
-            @include transition(background 100ms linear)
-        &:hover:before
-            background: rgba(0, 0, 0, .5)
-            color: #fff
-            +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
-    .oe_handle.e
-        left: auto
-        top: 2px
-        height: 100%
-        right: -4px
-        cursor: w-resize
-        &:before
-            content: "\F061"
-    .oe_handle.s, .oe_handle.size
-        top: auto
-        left: 2px
-        width: 100%
-        bottom: -4px
-        cursor: n-resize
-        &:before
-            content: "\F063"
-    .oe_handle.size
-        border-style: dashed
-        border-width: 0 0 1px 0
-        border-color: rgba(0, 0, 0, 0.5)
-        &:before
-            content: "Resize"
-            width: 64px
-            text-align: center
-            margin-left: -32px
-            margin-top: -4px
-    .oe_handle.w
-        top: 2px
-        height: 100%
-        left: -4px
-        cursor: e-resize
-        &:before
-            content: "\F060"
-    .oe_handle.n
-        left: 2px
-        width: 100%
-        top: -4px
-        cursor: s-resize
-        &:before
-            content: "\F062"
-
-    .icon.btn
-        display: inline-block
-
-    .oe_overlay_options
-        position: absolute
-        width: 100%
-        text-align: center
-        top: -11px
-        z-index: 1002
-        .btn, a
-            pointer-events: auto
-            cursor: pointer
-        .dropdown
-            display: inline-block
-        .dropdown-menu
-            text-align: left
-            min-width: 180px
-        .dropdown-menu select,.dropdown-menu input
-            display: block
-
-.oe_handle
-    pointer-events: auto
-    position: absolute
-    top: 50%
-    left: 50%
-    display: block
-    +box-sizing(border-box)
-    width: 8px
-    height: 8px
-    margin: -4px
-
-.s-resize-important, .s-resize-important *
-    cursor: s-resize !important
-.n-resize-important, .n-resize-important *
-    cursor: n-resize !important
-.e-resize-important, .e-resize-important *
-    cursor: e-resize !important
-.w-resize-important, .w-resize-important *
-    cursor: w-resize !important
-.move-important, .move-important *
-    cursor: move !important
-
-// }}}
-
 /* ---- MOBILE PREVIEW ---- {{{ */
 
 $mobile_preview_background: #000000
-- 
cgit v1.2.3


From 2d659d5102ea70caa61b4b8d3990d51a33d92754 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 15 Jan 2014 14:02:13 +0100
Subject: [IMP] website: clean editor.css

bzr revid: chm@openerp.com-20140115130213-r55f246btqus6dzj
---
 addons/website/static/src/css/editor.sass | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e3e3f27166b..a16f5f39383 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -76,18 +76,6 @@
 .cke_editable .css_editable_mode_hidden
     display: none
 
-.oe_carousel_options
-    cursor: pointer
-    position: absolute
-    white-space: nowrap
-    z-index: 1
-    display: none
-    > *
-        display: inline-block !important
-        vertical-align: middle !important
-        position: relative !important
-        top: +2px
-
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
     background-image: url('/website/static/src/img/edit_here.png') !important
 
-- 
cgit v1.2.3


From e2fede3fe78c0f1c036f4f1695ebf7348655590f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 16 Jan 2014 10:47:47 +0100
Subject: [ADD] dialog for fontawesome glyph manipulation

bzr revid: xmo@openerp.com-20140116094747-w1uey27l39fy66zc
---
 addons/website/static/src/css/editor.sass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index a16f5f39383..2e0e5250fb7 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -25,7 +25,7 @@
     +box-shadow(none)
 
 // }}}
-
+ 
 /* ---- OpenERP Style ---- {{{ */
 
 .oe_website_editorbar
@@ -177,6 +177,9 @@ ul.oe_menu_editor
 .cke_widget_wrapper
     position: static !important
 
+.cke_widget_inline
+    display: inline !important
+
 // prevent inline widgets from entirely disappearing when their (textual)
 // content is removed
 .cke_widget_editable
@@ -202,6 +205,10 @@ ul.oe_menu_editor
     // This z-index is due to .navbar of bootstrap
     z-index: 1000
 
+// fontawesome
+.cke_editable .fa
+    cursor: pointer
+
 // }}}
 
 /* ---- MOBILE PREVIEW ---- {{{ */
-- 
cgit v1.2.3


From 4ff74cbf9929ad41a01fd22c9e3c6050277a6214 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 16 Jan 2014 19:05:35 +0100
Subject: [IMP] website: editor menus is displayed in function of users groups
 (event, blog...)

bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
---
 addons/website/static/src/css/editor.sass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 2e0e5250fb7..923bd63e7dd 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -70,6 +70,9 @@
 .css_editable_display
     display: block !important
 
+.css_editable_hidden
+    display: none !important
+
 .css_non_editable_mode_hidden
     display: none
 
-- 
cgit v1.2.3


From 501e88d3ebb628774d30eaccff6a93327853a033 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Jan 2014 16:36:10 +0100
Subject: [IMP] replace select2 by grid for icons selection

bzr revid: xmo@openerp.com-20140120153610-xktkxjfbpl59xnpz
---
 addons/website/static/src/css/editor.sass | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 923bd63e7dd..8e29015fac0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -172,6 +172,19 @@ ul.oe_menu_editor
         display: inline-block !important
         visibility: visible !important
 
+// fontawesome modal
+.modal .font-icons-icons
+    font-size: 2em
+    max-height: 6em
+    overflow: auto
+
+    .font-icons-icon
+        display: inline-block
+        width: 2em
+        padding: 0.25em
+        text-align: center
+        cursor: pointer
+
 .existing-attachments .pager .disabled
     display: none
 
-- 
cgit v1.2.3


From ca02581993f0ead8a0c3a6e7111537bf61fc65be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Jan 2014 17:26:04 +0100
Subject: [IMP] replace icon size select by selectable multi-size preview

bzr revid: xmo@openerp.com-20140120162604-yoyg21bf1z306hwg
---
 addons/website/static/src/css/editor.sass | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8e29015fac0..d35e07e6995 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -173,17 +173,28 @@ ul.oe_menu_editor
         visibility: visible !important
 
 // fontawesome modal
-.modal .font-icons-icons
-    font-size: 2em
-    max-height: 6em
-    overflow: auto
-
-    .font-icons-icon
-        display: inline-block
-        width: 2em
-        padding: 0.25em
+.modal
+    .font-icons-icons
+        font-size: 2em
+        max-height: 6em
+        overflow: auto
+
+        .font-icons-icon
+            display: inline-block
+            width: 2em
+            padding: 0.25em
+            text-align: center
+            cursor: pointer
+
+    #fa-preview
         text-align: center
-        cursor: pointer
+
+        span
+            cursor: pointer
+            padding: 0 15px
+        .font-icons-selected
+            background-color: #ddd
+
 
 .existing-attachments .pager .disabled
     display: none
-- 
cgit v1.2.3


From 51f6977f3947b74c7d6f18bea0d9d0e30a9a4454 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 21 Jan 2014 11:04:08 +0100
Subject: [IMP] icons selection dialog

remove fixed size checkbox
add fayt for icons (by name)

bzr revid: xmo@openerp.com-20140121100408-64e32iio9r77yx9m
---
 addons/website/static/src/css/editor.sass | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d35e07e6995..27cee9a2eae 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -186,6 +186,19 @@ ul.oe_menu_editor
             text-align: center
             cursor: pointer
 
+    .font-icons
+        position: relative
+        display: block
+
+        &:before
+            +opacity(0.7)
+            position: absolute
+            top: 2px
+            left: 3px
+            font-size: 2em
+    #icon-search
+        padding-left: 2.5em
+
     #fa-preview
         text-align: center
 
-- 
cgit v1.2.3


From 35b8850ecc8d3cda929f77993e6a3c5bacab1276 Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Tue, 21 Jan 2014 13:53:25 +0100
Subject: [IMP] add SEO preview

bzr revid: ddm@openerp.com-20140121125325-641psvqr4w96lsci
---
 addons/website/static/src/css/editor.sass | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 27cee9a2eae..ce9e43ec1a2 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -313,6 +313,47 @@ $highlighted_text_color: #ffffff
     .oe_seo_keyword
         padding: .2em .4em .2em .5em
         +border-radius(.4em)
+    li.oe_seo_preview_g
+        line-height: 1.2
+        list-style: none
+        list-style-image: none
+        list-style-position: outside
+        list-style-type: none
+        font-size: small
+        font-family: arial,sans-serif
+        h3
+            font-size: medium
+        .r
+            margin: 0
+            font-size: 16px
+            font-style: normal
+            font-weight: normal
+            overflow: hidden
+            text-overflow: ellipsis
+            -webkit-text-overflow: ellipsis
+            white-space: nowrap
+            a
+                color: rgb(30, 15, 190)
+                text-decoration: underline
+                text-transform: none
+                em
+                    font-style: normal !important
+        .s
+            color: #444
+            max-width: 42em
+        .kv,.slp
+            display: block
+            margin-bottom: 1px
+        .f
+            color: #666
+            margin-bottom: 1px
+            cite
+                color: #006621
+                font-style: normal
+                font-size: 14px
+        .st
+            line-height: 1.24
+
 
 // }}}
 
-- 
cgit v1.2.3


From 43044d8ee72b3affbd53c9fafb68099d2deb0f87 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 27 Jan 2014 14:58:28 +0100
Subject: [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded
 values; remove visibility; add constraints

bzr revid: chm@openerp.com-20140127135828-z848mvpis5d9xyh8
---
 addons/website/static/src/css/editor.sass | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/css/editor.sass')

diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ce9e43ec1a2..3abfa4cff05 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -73,9 +73,6 @@
 .css_editable_hidden
     display: none !important
 
-.css_non_editable_mode_hidden
-    display: none
-
 .cke_editable .css_editable_mode_hidden
     display: none
 
-- 
cgit v1.2.3