diff options
| author | Siddarth Gajjar <sga@odoo.com> | 2020-02-18 06:17:08 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-03-05 10:42:43 +0000 |
| commit | 6a56b6c47b7cf45f9c49ccda68cfa3f68d6cee25 (patch) | |
| tree | c4458b7aba8bf85fe12b0aee4675bffc46af8897 | |
| parent | b10841acbe31fffb00bde4e2b4ee23a0d5042929 (diff) | |
[IMP] crm: remove custom css on form view
Purpose of this commit is to get rid of custom css code and file and use
standard bootstrap classes.
TaskID 2182610
Closes #45472
closes odoo/odoo#46948
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
| -rw-r--r-- | addons/crm/static/src/css/crm.css | 12 | ||||
| -rw-r--r-- | addons/crm/views/crm_lead_views.xml | 8 | ||||
| -rw-r--r-- | addons/crm/views/crm_templates.xml | 5 |
3 files changed, 5 insertions, 20 deletions
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css deleted file mode 100644 index 0cd13b24b70..00000000000 --- a/addons/crm/static/src/css/crm.css +++ /dev/null @@ -1,12 +0,0 @@ -@charset "utf-8"; -.openerp .oe_margin_top_8 { - margin-top: 8px; -} - -.o_pls_probability button { - font-size: 1.2rem; -} - -.o_pls_probability small { - font-size: 1rem; -} diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 93631a392a0..fd6475b7896 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -90,14 +90,16 @@ </div> </div> <div class="col"> - <span class="oe_edit_only o_pls_probability"> + <div class="oe_edit_only d-flex align-items-center"> <label for="probability"/> <button class="btn btn-link" name="action_set_automated_probability" type="object" attrs="{'invisible': [('is_automated_probability', '=', True)]}"> <i class="fa fa-gear" role="img" title="Switch to automatic probability" aria-label="Switch to automatic probability"></i> </button> - <small class="oe_grey" attrs="{'invisible': [('is_automated_probability', '=', True)]}"><field name="automated_probability"/> %% (Estimated by Odoo)</small> - </span> + <small class="oe_grey h6 mb0" attrs="{'invisible': [('is_automated_probability', '=', True)]}"> + <field class="mb0" name="automated_probability"/> %% (Estimated by Odoo) + </small> + </div> <div id="probability" class="o_row d-flex"> <field name="is_automated_probability" invisible="1"/> <field name="probability" widget="float" class="oe_inline"/> diff --git a/addons/crm/views/crm_templates.xml b/addons/crm/views/crm_templates.xml index 3f6afab1c9a..5e601559a8e 100644 --- a/addons/crm/views/crm_templates.xml +++ b/addons/crm/views/crm_templates.xml @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <template id="assets_backend" name="crm assets" inherit_id="web.assets_backend"> - <xpath expr="." position="inside"> - <link rel="stylesheet" href="/crm/static/src/css/crm.css"/> - </xpath> - </template> <template id="assets_tests" name="CRM Assets Tests" inherit_id="web.assets_tests"> <xpath expr="." position="inside"> <script type="text/javascript" src="/crm/static/src/js/tours/crm.js"></script> |