summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorJiten (OpenERP) <jra@tinyerp.com>2012-02-09 11:32:16 +0530
committerJiten (OpenERP) <jra@tinyerp.com>2012-02-09 11:32:16 +0530
commitf5e2fe1ff02f37088bce73b39fdf7328e568aa1a (patch)
treeafdf585c2ed8600b314637f89e7a6bc0bbdd6823 /addons/web/static/src/css
parenta9aaad2257ae9b61729757007ef59db41f8521f4 (diff)
parent98bd34a2eb74d5226279795014c178c08aec4ee6 (diff)
[Merge] Merge from openerp-web.
bzr revid: jra@tinyerp.com-20120209060216-7srqio91yxlu7yi0
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css15
1 files changed, 14 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 926f930e521..c7c79c5c6ea 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1235,6 +1235,8 @@ label.error {
.openerp label.oe_label_help, .openerp label.oe_label,
+.openerp .oe_form_paragraph,
+.openerp .oe_form_field_statusbar,
.openerp .oe_forms input[type="text"],
.openerp .oe_forms input[type="password"],
.openerp .oe_forms input[type="file"],
@@ -1305,12 +1307,23 @@ label.error {
white-space: normal;
}
+.openerp .oe_forms .oe_form_paragraph.oe_multilines {
+ white-space: pre;
+}
+
.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title,
.openerp .oe_form_field_one2many_list .oe-actions h3.oe_view_title{
display: inline;
margin: 0 0.5em 0 0;
}
+.openerp .oe_forms .oe-listview th.oe-sortable .ui-icon,
+.openerp .oe_forms .oe-listview th.oe-sortable .ui-icon {
+ height: 100%;
+ margin-top: -9px;
+}
+
+
/* Uneditable Form View */
.openerp .oe_form_readonly {
@@ -1891,7 +1904,7 @@ label.error {
text-align: left;
border-bottom: 1px solid #CFCCCC;
}
-.oe-number{
+.openerp .oe-treeview-table .oe-number {
text-align: right !important;
}
.treeview-tr span, .treeview-td span {