From 6f71304ad6ef6e85c11b11efaebf104bad868e38 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Wed, 13 Nov 2013 16:20:53 +0530 Subject: [PATCH 1/7] [IMP] Improved code according to the changes of bootstrap3 in web. bzr revid: psa@tinyerp.com-20131113105053-80qelj2buiehd6fl --- addons/im/static/src/js/im.js | 2 +- addons/portal_anonymous/static/src/js/portal_anonymous.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index 6fbf452f974..870e32f4bc6 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -83,7 +83,7 @@ }); }, calc_box: function() { - var $topbar = instance.client.$(".oe_topbar"); + var $topbar = instance.client.$(".navbar"); var top = $topbar.offset().top + $topbar.height(); top = Math.max(top - $(window).scrollTop(), 0); this.$el.css("top", top); diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js index d4f6351efc9..b289db2053f 100644 --- a/addons/portal_anonymous/static/src/js/portal_anonymous.js +++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js @@ -71,7 +71,7 @@ openerp.portal_anonymous = function(instance) { this.$el.find('a.login').click(function() { var p = self.getParent(); var am = p.action_manager; - p.$el.find('.oe_leftbar, .oe_topbar').hide(); + p.$el.find('.oe_leftbar, .navbar').hide(); self.session.session_logout().done(function () { am.do_action({ type:'ir.actions.client', From f726a07c1157bc7458a6ea7a3897dd761542573d Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 14 Nov 2013 11:57:43 +0530 Subject: [PATCH 2/7] [FIX] Fixed the issue of positioning of signin icon in navbar, bzr revid: psa@tinyerp.com-20131114062743-zku2t3lpoyyc8451 --- addons/hr_attendance/static/src/css/slider.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css index 664d4f96e41..849cd33a894 100644 --- a/addons/hr_attendance/static/src/css/slider.css +++ b/addons/hr_attendance/static/src/css/slider.css @@ -5,7 +5,7 @@ display: inline-block; } .openerp .oe_attendance_signin { - float:left; + float: right; height: 32px; width: 32px; background: url(/hr_attendance/static/src/img/emp-out32.png); From 1098f7021ecc9a1ee81c02532570a2f47ddef628 Mon Sep 17 00:00:00 2001 From: ima-openerp Date: Thu, 14 Nov 2013 17:35:29 +0530 Subject: [PATCH 3/7] [IMP]improved css for sales team kanban, sale order payment_acquirers and attach file button. bzr revid: ima@tinyerp.com-20131114120529-5ltoe9aoglsx92vv --- addons/crm/static/src/css/crm.css | 7 +++++-- addons/im/static/src/js/im.js | 2 +- addons/mail/static/src/css/mail.css | 4 +--- addons/portal/static/src/css/portal.css | 2 +- addons/portal_anonymous/static/src/js/portal_anonymous.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css index ba4473edc26..cce8248bc8b 100644 --- a/addons/crm/static/src/css/crm.css +++ b/addons/crm/static/src/css/crm.css @@ -1,5 +1,8 @@ .openerp .oe_kanban_view .oe_kanban_crm_salesteams { - width: 345px; + /* Customize width and height of kanban according bootstrap3 */ + width: 357px; + min-height: 254px !important; + /* End of customize */ } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars { text-align: right; @@ -21,7 +24,7 @@ .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list { position: relative; - margin: 10px; + margin: 10px 0 10px 9px; /* Improved margin to set alignment of list items according bootstrap3 */ } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div { width: 160px; diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index 870e32f4bc6..93069fd0276 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -83,7 +83,7 @@ }); }, calc_box: function() { - var $topbar = instance.client.$(".navbar"); + var $topbar = instance.client.$(".navbar"); // .oe_topbar is replaced with .navbar of bootstrap3 var top = $topbar.offset().top + $topbar.height(); top = Math.max(top - $(window).scrollTop(), 0); this.$el.css("top", top); diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index e4b7f9247e3..e25bc816a95 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -94,9 +94,7 @@ } .openerp .oe_mail .oe_msg .oe_msg_footer{ margin-left: 4px; - padding-top: 3px; overflow: hidden; - margin-bottom: 4px; font-size: 11px; } .openerp .oe_mail .oe_msg .oe_msg_content{ @@ -478,7 +476,7 @@ } .openerp .oe_mail .oe_msg_footer button.oe_attach{ width: 24px; - overflow: hidden; + margin-bottom: 8px; /* improved margin of file attach button according bootstrap3 */ filter:none; } .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{ diff --git a/addons/portal/static/src/css/portal.css b/addons/portal/static/src/css/portal.css index 45c0cdd7805..e32f3b0e639 100644 --- a/addons/portal/static/src/css/portal.css +++ b/addons/portal/static/src/css/portal.css @@ -10,7 +10,7 @@ margin: -40px 0 -32px -24px; position: relative; padding: 10px 15px; - right: -153px; + right: -125px; /* improved margin according bootstrap3 */ background: #729FCF; background-image: -webkit-gradient(linear, left top, left bottom, from(#729FCF), to(#3465A4)); diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js index b289db2053f..f6b41eb59f0 100644 --- a/addons/portal_anonymous/static/src/js/portal_anonymous.js +++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js @@ -71,7 +71,7 @@ openerp.portal_anonymous = function(instance) { this.$el.find('a.login').click(function() { var p = self.getParent(); var am = p.action_manager; - p.$el.find('.oe_leftbar, .navbar').hide(); + p.$el.find('.oe_leftbar, .navbar').hide(); // .oe_topbar is replaced with .navbar of bootstrap3 self.session.session_logout().done(function () { am.do_action({ type:'ir.actions.client', From 88a79fdaf361822aa0634bf0ae828c9758416217 Mon Sep 17 00:00:00 2001 From: ima-openerp Date: Fri, 15 Nov 2013 15:43:17 +0530 Subject: [PATCH 4/7] [IMP]improved css for survey kanban, file attach button and my current timesheet in hr. bzr revid: ima@tinyerp.com-20131115101317-3jb422klc3jgdwps --- addons/hr_timesheet_sheet/static/src/css/timesheet.css | 2 +- addons/mail/static/src/css/mail.css | 2 +- addons/survey/static/src/css/survey.css | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css index 36ea9a34db9..dca253cd9fc 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css @@ -19,7 +19,7 @@ text-align: center; color: #006699; font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif; - font-size: 10px; + font-size: 11px; background: #eeeeee; min-width: 47px; } diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index e25bc816a95..6f4c6361e95 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -476,7 +476,7 @@ } .openerp .oe_mail .oe_msg_footer button.oe_attach{ width: 24px; - margin-bottom: 8px; /* improved margin of file attach button according bootstrap3 */ + margin-bottom: 5px; /* improved margin of file attach button according bootstrap3 */ filter:none; } .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{ diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css index 34d686c6e77..15899533213 100644 --- a/addons/survey/static/src/css/survey.css +++ b/addons/survey/static/src/css/survey.css @@ -6,6 +6,8 @@ } .openerp .oe_kanban_survey { - width: 200px; - + /* Customize height and width according bootstrap3 */ + width: 212px; + min-height: 86px !important; + /* End of customize */ } From 926ff04ed83f466cc1ec675b926656b61a9fb110 Mon Sep 17 00:00:00 2001 From: ima-openerp Date: Mon, 18 Nov 2013 11:03:59 +0530 Subject: [PATCH 5/7] [IMP]improved css for pos screen header. bzr revid: ima@tinyerp.com-20131118053359-ccc5w6zrunagx2v6 --- addons/point_of_sale/static/src/css/pos.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 89ab429c4f4..71d2cf6d58f 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -126,6 +126,7 @@ background: #393939; background: -moz-linear-gradient(#7b7979, #393939); background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939)); + z-index: 2; /* Customize according bootstrap3 navbar */ } /* a) The left part of the top-bar */ @@ -659,6 +660,7 @@ .point-of-sale .screen header h2 { margin-top: 0px; padding-top: 7px; + font-size: 1.5em /* Customize font according bootstrap3 */ } .point-of-sale .screen p{ font-size: 18px; From 3bf3bc38957ffd9fcc82cdd9fe33400c67faac6b Mon Sep 17 00:00:00 2001 From: ima-openerp Date: Mon, 18 Nov 2013 17:46:05 +0530 Subject: [PATCH 6/7] [IMP]improved css for base_import, mass_mailing and idea module. bzr revid: ima@tinyerp.com-20131118121605-1rn0z4hojxblngbu --- addons/base_import/static/src/css/import.css | 10 ++++++++++ addons/idea/static/src/css/idea_idea.css | 2 +- addons/mass_mailing/static/src/css/mass_mailing.css | 12 +++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css index 3913619b6c9..3d3c60d957b 100644 --- a/addons/base_import/static/src/css/import.css +++ b/addons/base_import/static/src/css/import.css @@ -1,12 +1,14 @@ .oe_import > p { margin-left: 8px; margin-right: 8px; + margin-top: 13px; /* Customize space according bootstrap3 */ text-align: justify } .oe_import h2 { margin-top: 0; margin-bottom: 5px; + font-size: 1.5em; /* Customize according bootstrap3 */ } .oe_padding { @@ -22,6 +24,14 @@ border: solid 1px #dddddd; width: 600px; } +/* Customize according bootstrap3 */ +.oe_import .oe_import_box label{ + font-weight: normal; +} +.oe_import .oe_import_box .oe_import_file { + display: inline-block; +} +/* End of Customize */ .oe_import .oe_import_toggle{ margin-top: 8px; } diff --git a/addons/idea/static/src/css/idea_idea.css b/addons/idea/static/src/css/idea_idea.css index 08daffd902a..ff146bd189d 100644 --- a/addons/idea/static/src/css/idea_idea.css +++ b/addons/idea/static/src/css/idea_idea.css @@ -1,5 +1,5 @@ .openerp .oe_kanban_view .oe_kanban_idea_idea { - width: 200px; + width: 212px; /* Customize width according bootstrap3 */ } .openerp .oe_kanban_view .oe_kanban_idea_idea .oe_avatars { diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css index ca5455d6323..e54ce46c025 100644 --- a/addons/mass_mailing/static/src/css/mass_mailing.css +++ b/addons/mass_mailing/static/src/css/mass_mailing.css @@ -1,13 +1,19 @@ .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign { - width: 540px; + /* Customize to manage content */ + width: 552px; + min-height: 278px !important; + /* End of customize */ } .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment { - width: 270px; + /* Customize to manage content */ + width: 282px; + min-height: 246px !important; + /* End of customize */ } .openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_stats { - width: 120px; + width: 122px; /* Manage space in between stats */ display: inline-block; margin: 2px 5px 0px 5px; text-align: center; From beea089c21cbdf77a5ac041145db85fc9b411ade Mon Sep 17 00:00:00 2001 From: ima-openerp Date: Tue, 19 Nov 2013 17:28:40 +0530 Subject: [PATCH 7/7] [IMP]improved css of base_import module for dd, label and p tags. bzr revid: ima@tinyerp.com-20131119115840-o8evs0ap85xf7ybp --- addons/base_import/static/src/css/import.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css index 3d3c60d957b..579b6e26999 100644 --- a/addons/base_import/static/src/css/import.css +++ b/addons/base_import/static/src/css/import.css @@ -50,7 +50,7 @@ } .oe_import .oe_import_options p { - margin: 0; + margin: 0 0 -7px 0; /* Customize margin-bottom of

according bootstrap3 */ padding: 0; } .oe_import .oe_import_options label { @@ -79,6 +79,14 @@ .oe_import .oe_import_report_more { display: none; } +/* Customize dd and label according bootstrap3 */ +.oe_import dd { + -webkit-margin-start: 40px; +} +.oe_import .oe_import_with_file label { + font-weight: normal; +} +/* End of customize */ .oe_import.oe_import_preview .oe_import_grid { display: table;