[MERGE] from trunk

bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb
2013-10-07 10:57:50 +02:00
parent 0448dff011 dd2dd19b23
commit 1b232de765
78 changed files with 167 additions and 1272 deletions
@@ -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 ---- */