diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-10-07 10:57:50 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-10-07 10:57:50 +0200 |
| commit | 1b232de7652149cb9679e4c8fc05ab362f6f08e4 (patch) | |
| tree | f1dd87830842452b1fb18277694fb756014056bc /addons/website/static/src/css | |
| parent | 0448dff01119d3314f9ebac1b02acc94176f2078 (diff) | |
| parent | dd2dd19b234cb5f3de05465215b745d3e93046c7 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 1 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index e08157124c5..5604c62af75 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -330,6 +330,7 @@ table.editorbar-panel td.selected { color: white; height: 48px; margin-bottom: 32px; + padding-top: 12px; } /* ---- SNIPPET MANIPULATOR ---- */ diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index c8854b210ec..7b2800bd849 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -429,15 +429,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 ---- */ |