diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-09-19 12:20:14 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-09-19 12:20:14 +0200 |
| commit | fd24ee28c0b00c4b92d193bdb12cb8c1af120a4f (patch) | |
| tree | 54cdbf4f70d25f8d23bb65bbed3109f6a33214b5 /addons/website/static/src/css | |
| parent | f75b49dab44a0d6a6f9452ee57eaaa6c12bb3014 (diff) | |
[IMP] website snippets: change style of edit button; add font and fix bootstrap; add style menu
bzr revid: chm@openerp.com-20130919102014-vf8etjniyevj40n3
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 29 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 26 |
2 files changed, 27 insertions, 28 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 1c7ef36b236..402293bc84f 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -149,6 +149,10 @@ table.editorbar-panel td.selected { box-shadow: 0px 10px 10px -10px black inset; z-index: 1010; overflow: hidden; + height: 110px; +} +#oe_snippets:hover { + height: auto; } #oe_snippets .scroll { white-space: nowrap; @@ -349,34 +353,29 @@ table.editorbar-panel td.selected { display: inline-block; } .oe_overlay .oe_overlay_options { + position: absolute; + width: 100%; + text-align: center; + top: -11px; display: none; z-index: 1002; } -.oe_overlay .oe_overlay_options .oe_options, .oe_overlay .oe_overlay_options .oe_label, .oe_overlay .oe_overlay_options .oe_move { - position: absolute; - display: block; - z-index: 1002; - top: -11px; +.oe_overlay .oe_overlay_options > div { + display: inline-block; } -.oe_overlay .oe_overlay_options .oe_options { +.oe_overlay .oe_overlay_options .btn { pointer-events: auto; - left: -14px; + display: inline-block; } .oe_overlay .oe_overlay_options .oe_label { - top: -8px; + position: absolute; + top: 3px; right: 6px; background: white; font-size: 75%; color: rgba(153, 0, 255, 0.5); padding: 0 5px; } -.oe_overlay .oe_overlay_options .oe_move { - pointer-events: auto; - left: 50%; -} -.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; } 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 |
