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

[IMP] clean CSS and multiiline M2O 

bzr revid: fp@tinyerp.com-20120912171624-wx9pfhi9qb3vmxs6
This commit is contained in:
Fabien Pinckaers 2012-09-12 19:16:24 +02:00
parent efa35fac7a
commit 5a5feab65b
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
display: none !important;
}
}
.openerp.openerp_webclient_container {
height: 100%;
position: relative;
@ -40,7 +41,7 @@
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
/* http://www.quirksmode.org/dom/inputfile.html
* http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
*/
*/ */
}
.openerp :-moz-placeholder {
color: #afafb6 !important;
@ -243,7 +244,7 @@
border-radius: 0 0 2px 2px;
}
.openerp.ui-dialog .ui-dialog-buttonpane button {
margin: 0;
margin: 0 4px 0 0;
}
.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: left;

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

@ -266,7 +266,7 @@ $sheet-max-width: 860px
margin: 0
@include radius(0 0 2px 2px)
button
margin: 0
margin: 0 4px 0 0
.ui-dialog-buttonset
float: left
.ui-button

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

@ -2954,14 +2954,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
var lines = _.escape(str).split("\n");
var link = "";
var follow = "";
if (! this.options.highlight_first_line) {
link = lines.join("<br />");
} else {
link = lines[0];
follow = _.rest(lines).join("<br />");
if (follow)
link += "<br />";
}
link = lines[0];
follow = _.rest(lines).join("<br />");
if (follow)
link += "<br />";
var $link = this.$el.find('.oe_form_uri')
.unbind('click')
.html(link);