odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] bootstrap3 

bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
This commit is contained in:
Antony Lesuisse 2013-12-02 14:24:45 +01:00
parent d6c6f31231 e22d25ecdc
commit 57ef91409a
12 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/base_import/static/src/css/import.css vendored
View File

@ -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;
}
@ -40,7 +50,7 @@
}
.oe_import .oe_import_options p {
margin: 0;
margin: 0 0 -7px 0; /* Customize margin-bottom of <p> according bootstrap3 */
padding: 0;
}
.oe_import .oe_import_options label {
@ -69,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;

7
addons/crm/static/src/css/crm.css
View File

@ -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;

2
addons/hr_attendance/static/src/css/slider.css
View File

@ -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);

2
addons/hr_timesheet_sheet/static/src/css/timesheet.css
View File

@ -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;
}

2
addons/idea/static/src/css/idea_idea.css
View File

@ -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 {

2
addons/im/static/src/js/im.js
View File

@ -80,7 +80,7 @@
});
},
calc_box: function() {
var $topbar = instance.client.$(".oe_topbar");
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);

4
addons/mail/static/src/css/mail.css
View File

@ -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: 5px; /* improved margin of file attach button according bootstrap3 */
filter:none;
}
.openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{

12
addons/mass_mailing/static/src/css/mass_mailing.css
View File

@ -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;

2
addons/point_of_sale/static/src/css/pos.css
View File

@ -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;

2
addons/portal/static/src/css/portal.css
View File

@ -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));

2
addons/portal_anonymous/static/src/js/portal_anonymous.js
View File

@ -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(); // .oe_topbar is replaced with .navbar of bootstrap3
self.session.session_logout().done(function () {
am.do_action({
type:'ir.actions.client',

6
addons/survey/static/src/css/survey.css
View File

@ -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 */
}