From 73f663eed0e450cdfc8095a67edab646bf858559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 5 Dec 2013 13:47:49 +0100 Subject: [PATCH] [CLEAN] crm: cleaned modifications before merging : - moved css into sass file to standardize the process - commented some records added in the xml file of crm.case.section that do not seem necessary bzr revid: tde@openerp.com-20131205124749-3a1quhetgxq2d224 --- addons/crm/crm_case_section_view.xml | 10 ++-- addons/crm/static/src/css/Makefile | 2 + addons/crm/static/src/css/crm.css | 90 ++++++++++++++-------------- addons/crm/static/src/css/crm.sass | 55 +++++++++++++++++ 4 files changed, 106 insertions(+), 51 deletions(-) create mode 100644 addons/crm/static/src/css/Makefile create mode 100644 addons/crm/static/src/css/crm.sass diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml index b674bf95061..69957e4f39b 100644 --- a/addons/crm/crm_case_section_view.xml +++ b/addons/crm/crm_case_section_view.xml @@ -71,7 +71,7 @@ [('type','=', 'lead'),('section_id', '=', active_id)] Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis. - + Opportunities Analysis @@ -94,7 +94,7 @@ Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline. - + @@ -350,4 +350,4 @@ parent="base.menu_sales" groups="base.group_multi_salesteams"/> - + \ No newline at end of file diff --git a/addons/crm/static/src/css/Makefile b/addons/crm/static/src/css/Makefile new file mode 100644 index 00000000000..a2ced24a13d --- /dev/null +++ b/addons/crm/static/src/css/Makefile @@ -0,0 +1,2 @@ +crm.css: crm.sass + sass --trace -t expanded crm.sass:crm.css diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css index 914cce8dcac..8999f758e41 100644 --- a/addons/crm/static/src/css/crm.css +++ b/addons/crm/static/src/css/crm.css @@ -1,64 +1,62 @@ +@charset "utf-8"; .openerp .oe_kanban_view .oe_kanban_crm_salesteams { - /* Customize width and height of kanban according bootstrap3 */ - width: 357px; - min-height: 254px !important; - /* End of customize */ - cursor: default; + /* Customize width and height of kanban according bootstrap3 */ + width: 357px; + min-height: 254px !important; + /* End of customize */ + cursor: default; } -.openerp .oe_kanban_view .oe_kanban_salesteams_avatars { - margin-top: 20px; -} - -.openerp .oe_kanban_view .oe_kanban_salesteams_avatars img { - width: 30px; - height: 30px; - padding-left: 0px; - margin-top: 3px; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -} - .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list { - position: relative; - margin: 10px 0 10px 9px; /* Improved margin to set alignment of list items according bootstrap3 */ - min-height: 10px; + position: relative; + /* Improved margin to set alignment of list items according bootstrap3 */ + margin: 10px 0 10px 9px; + min-height: 10px; } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div { - width: 160px; - height: 22px; - margin: 0 !important; - position: relative; - display: inline-block; - float: left; -} -.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover { - text-decoration: underline !important; + width: 160px; + height: 22px; + margin: 0 !important; + position: relative; + display: inline-block; + float: left; } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) { - position: absolute; - left: 90px; - top: 0; + position: absolute; + left: 90px; + top: 0; } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) { - left: 110px; + left: 110px; +} +.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover { + text-decoration: underline !important; } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center { - text-align: center; - margin: 3px 0; + text-align: center; + margin: 3px 0; } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_sum { - margin: 0; - font-size: 40px; + margin: 0; + font-size: 40px; } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum { - font-size: 10px; + font-size: 10px; } - .openerp .oe_kanban_view .oe_salesteams_help { - display: inline-block; + display: inline-block; +} +.openerp .oe_kanban_view .oe_kanban_salesteams_avatars { + margin-top: 20px; +} +.openerp .oe_kanban_view .oe_kanban_salesteams_avatars img { + width: 30px; + height: 30px; + padding-left: 0px; + margin-top: 3px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } - diff --git a/addons/crm/static/src/css/crm.sass b/addons/crm/static/src/css/crm.sass new file mode 100644 index 00000000000..5c70981e52f --- /dev/null +++ b/addons/crm/static/src/css/crm.sass @@ -0,0 +1,55 @@ +@charset "utf-8" + +.openerp + .oe_kanban_view + .oe_kanban_crm_salesteams + /* Customize width and height of kanban according bootstrap3 */ + width: 357px + min-height: 254px !important + /* End of customize */ + cursor: default + .oe_items_list + position: relative + /* Improved margin to set alignment of list items according bootstrap3 */ + margin: 10px 0 10px 9px + min-height: 10px + div + width: 160px + height: 22px + margin: 0 !important + position: relative + display: inline-block + float: left + a:nth-child(2n) + position: absolute + left: 90px + top: 0 + div:nth-child(2n) + a:nth-child(2n) + left: 110px + a:hover + text-decoration: underline !important + .oe_center + text-align: center + margin: 3px 0 + .oe_sum + margin: 0 + font-size: 40px + .oe_subsum + font-size: 10px + .oe_salesteams_help + display: inline-block + .oe_kanban_salesteams_avatars + margin-top: 20px + .oe_kanban_salesteams_avatars + img + width: 30px + height: 30px + padding-left: 0px + margin-top: 3px + -moz-border-radius: 2px + -webkit-border-radius: 2px + border-radius: 2px + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2)