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

[merge] 

bzr revid: nicolas.vanhoren@openerp.com-20120516140709-ue531n9e8wtny2l4
This commit is contained in:
niv-openerp 2012-05-16 16:07:09 +02:00
parent a6fa5d9a55 5f8a3c7fa4
commit cef99bfee0
3 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
addons/web/static/src/css/base.css
View File

@ -1,4 +1,4 @@
@charset "UTF-8";
@charset "utf-8";
@font-face {
font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@ -117,6 +117,9 @@
float: right;
margin-left: 8px;
}
.openerp .oe_text_right {
text-align: right;
}
.openerp .oe_clear {
clear: both;
}
@ -1415,7 +1418,7 @@
}
.openerp .oe_form_topbar button {
font-size: 12px;
height: 24px;
height: 24px !important;
line-height: 24px;
vertical-align: top;
padding: 0 10px;
@ -1508,44 +1511,30 @@
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
}
.openerp .oe_form_autolayout .oe_button {
height: 20px;
}
.openerp .oe_form_autolayout .oe_form_group_cell {
.openerp .oe_form .oe_form_group_cell {
line-height: 18px;
padding: 2px;
height: 20px;
}
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one input,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_char input,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_text textarea,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email input,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url input,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_float input,
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_selection select,
.openerp .oe_form_autolayout .oe_form_group_cell > div > .oe_datepicker_root,
.openerp .oe_form_autolayout .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master {
.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one input,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_char input,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_text textarea,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_email,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_email input,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_url,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_url input,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_float input,
.openerp .oe_form .oe_form_group_cell > .oe_form_field_selection select,
.openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root,
.openerp .oe_form .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master {
width: 100%;
}
.openerp .oe_form_autolayout .oe_form_button.oe_button {
color: #4c4c4c;
}
.openerp .oe_form_autolayout .oe_form_button.oe_button span {
position: relative;
vertical-align: top;
}
.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_button.oe_button {
white-space: nowrap;
min-width: 100%;
width: 100%;
}
.openerp .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested {
.openerp .oe_form .oe_form_group_cell.oe_form_group_nested {
padding: 0;
}
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
font-weight: bold;
white-space: nowrap;
padding-right: 8px;
}
@ -1673,6 +1662,7 @@
border: 1px solid #dd0000 !important;
}
.openerp .oe_form .oe_button.oe_field_button {
display: block;
-webkit-border-top-left-radius: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-topleft: 0px;
@ -1695,10 +1685,24 @@
right: 5px;
top: 3px;
}
.openerp .oe_form .oe_form_button.oe_button {
height: 22px;
color: #4c4c4c;
}
.openerp .oe_form .oe_form_button.oe_button span {
position: relative;
vertical-align: top;
}
.openerp .oe_form .oe_form_button > img {
vertical-align: -3px;
padding: 0 2px;
}
.openerp .oe_form .oe_form_group_cell > .oe_form_button.oe_button {
display: block;
white-space: nowrap;
min-width: 100%;
width: 100%;
}
.openerp .oe_form .oe-binary-file-set {
overflow: hidden;
position: relative;
@ -1842,7 +1846,7 @@
}
.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell {
padding: 2px 2px 2px 8px !important;
padding-left: 8px;
}
.openerp .oe-listview-content {
width: 100%;

40
addons/web/static/src/css/base.sass
View File

@ -143,6 +143,8 @@ $colour4: #8a89ba
.oe_right
float: right
margin-left: 8px
.oe_text_right
text-align: right
.oe_clear
clear: both
.oe_wait
@ -1152,7 +1154,7 @@ $colour4: #8a89ba
line-height: 30px
button
font-size: 12px
height: 24px
height: 24px !important
line-height: 24px
vertical-align: top
padding: 0 10px
@ -1229,10 +1231,8 @@ $colour4: #8a89ba
border: 1px solid #afafb6
@include box-shadow(0 0 10px rgba(0,0,0,0.3))
// }}}
// FormView.autolayout {{{
.oe_form_autolayout
.oe_button
height: 20px
// FormView.layout {{{
.oe_form
.oe_form_group_cell
line-height: 18px
padding: 2px
@ -1250,21 +1250,13 @@ $colour4: #8a89ba
.oe_form_group_cell > div > .oe_datepicker_root,
.oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master
width: 100%
.oe_form_button.oe_button
color: #4c4c4c
span
position: relative
vertical-align: top
.oe_form_group_cell > .oe_form_button.oe_button
white-space: nowrap
min-width: 100%
width: 100%
.oe_form_group_cell.oe_form_group_nested
padding: 0
// }}}
// FormView.label {{{
.oe_form
.oe_form_label_help[for], .oe_form_label[for]
font-weight: bold
white-space: nowrap
padding-right: 8px
span
@ -1373,10 +1365,8 @@ $colour4: #8a89ba
input, select, textarea
background-color: #F66 !important
border: 1px solid #D00 !important
// }}}
// FormView.buttons {{{
.oe_form
.oe_button.oe_field_button
display: block
-webkit-border-top-left-radius: 0px
-webkit-border-bottom-left-radius: 0px
-moz-border-radius-topleft: 0px
@ -1396,9 +1386,23 @@ $colour4: #8a89ba
filter: alpha(opacity=50)
right: 5px
top: 3px
// }}}
// FormView.buttons {{{
.oe_form
.oe_form_button.oe_button
height: 22px
color: #4c4c4c
span
position: relative
vertical-align: top
.oe_form_button > img
vertical-align: -3px
padding: 0 2px
.oe_form_group_cell > .oe_form_button.oe_button
display: block
white-space: nowrap
min-width: 100%
width: 100%
// }}}
// FormView.binaryfile {{{
/* http://www.quirksmode.org/dom/inputfile.html
@ -1536,7 +1540,7 @@ $colour4: #8a89ba
min-width: 120px
.oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
.oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell
padding: 2px 2px 2px 8px !important
padding-left: 8px
// }}}
// ListView {{{
.oe-listview-content

3
addons/web/static/src/js/view_form.js
View File

@ -984,9 +984,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
},
process: function($tag, layout) {
var self = this;
if ($tag.attr('layout') === 'auto') {
$tag.addClass('oe_form_autolayout');
}
layout = $tag.attr('layout') || layout || 'auto';
$tag.removeAttr('layout');
var tagname = $tag[0].nodeName.toLowerCase();