From 5086f1e1e13a06d9250ff28e5bf48dbe8cbd0a8a Mon Sep 17 00:00:00 2001 From: Christophe Matthieu 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.css | 11 +++++++---- addons/website/static/src/css/editor.sass | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index e895b1209ce..820329d5ed0 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -172,6 +172,9 @@ table.editorbar-panel td.selected { height: 32px; margin: -16px 0px; -webkit-transition: margin 250ms linear; + position: absolute; + background: rgba(153, 0, 255, 0.17); + border-radius: 3px; } .oe_drop_zone.oe_insert:first-child:not(:last-child) { margin-top: -8px; @@ -197,11 +200,11 @@ table.editorbar-panel td.selected { .oe_drop_zone.oe_insert.oe_hover:before { border-top: dashed 2px rgba(116, 255, 161, 0.72); } - -.oe_drop_zone.oe_overlay { +.oe_drop_zone.oe_insert.oe_vertical { + width: 16px; + display: inline-block; position: absolute; - background: rgba(153, 0, 255, 0.17); - border-radius: 3px; + margin: 0px !important; } .oe_drop_zone { 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 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.css | 1 + addons/website/static/src/css/editor.sass | 1 + 2 files changed, 2 insertions(+) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 820329d5ed0..806c5691852 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -172,6 +172,7 @@ table.editorbar-panel td.selected { height: 32px; margin: -16px 0px; -webkit-transition: margin 250ms linear; + width: 100%; position: absolute; background: rgba(153, 0, 255, 0.17); border-radius: 3px; 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 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.css | 1 + addons/website/static/src/css/editor.sass | 1 + 2 files changed, 2 insertions(+) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 806c5691852..0afd2be7f06 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -173,6 +173,7 @@ table.editorbar-panel td.selected { margin: -16px 0px; -webkit-transition: margin 250ms linear; width: 100%; + z-index: 1000; position: absolute; background: rgba(153, 0, 255, 0.17); border-radius: 3px; 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 74678c7632b7506d360e8a36990136a0dad7d434 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu 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.css | 3 +++ addons/website/static/src/css/editor.sass | 2 ++ 2 files changed, 5 insertions(+) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 0afd2be7f06..917db1b059a 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -285,6 +285,9 @@ table.editorbar-panel td.selected { .oe_overlay .oe_overlay_options .oe_move .js_box_move { margin-left: -50%; } +.oe_overlay .oe_overlay_options .dropdown-menu select, .oe_overlay .oe_overlay_options .dropdown-menu input { + display: block; +} .oe_overlay.oe_active .oe_overlay_options { display: block; } 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 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.css | 4 ++++ addons/website/static/src/css/editor.sass | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'addons/website/static/src/css') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 917db1b059a..9da978caa01 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -415,6 +415,10 @@ table.editorbar-panel td.selected { /* ---- ACE EDITOR ---- */ .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: 51px; 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