diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-09-13 16:55:30 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-09-13 16:55:30 +0200 |
| commit | 1adb76aad079a3cebf66fa2f50558f93bacbc52e (patch) | |
| tree | 9294bf2f392a3ee9f782623e9cfbd4d53775e51e /addons/website/static/src/css/editor.sass | |
| parent | f16b61cbe61a77cf331a54ea11520322e7730739 (diff) | |
| parent | ba99ab56c842542fdcf86daa05c3c2e13aaf3d2f (diff) | |
[MERGE] from parent branch
bzr revid: xmo@openerp.com-20130913145530-p1gm7k7ie5t3powp
Diffstat (limited to 'addons/website/static/src/css/editor.sass')
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 1dd71acefdc..9b6bf982116 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -181,6 +181,8 @@ table.editorbar-panel height: 32px margin: -16px 0px -webkit-transition: margin 250ms linear + width: 100% + z-index: 1000 &:first-child:not(:last-child) margin-top: -8px margin-bottom: -24px @@ -199,8 +201,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 @@ -267,6 +273,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 @@ -380,6 +388,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 |