diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-10-29 10:25:47 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-10-29 10:25:47 +0100 |
| commit | 90e0243f1a3706bde891dca8d437fcdaf01900ac (patch) | |
| tree | 759006f95ab1857939597926f98013d36cfac87f /addons/web/static/src | |
| parent | 415f519cd86ad5ad7085c5ba6f2cb4bd7c353e01 (diff) | |
| parent | 1def54dceeb1af5f27ec4dc156ac6eaa90aadd12 (diff) | |
[MERGE] Merged with web/trunk.
bzr revid: tde@openerp.com-20121029092547-u03gj7y066dtrf73
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 6 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ba6211ccceb..6ce93bc76bd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1326,9 +1326,6 @@ .openerp .oe_view_manager .oe_view_manager_body { height: inherit; } -.openerp .oe_view_manager .oe_view_manager_body .oe_view_manager_view_list { - min-height: 132px; -} .openerp .oe_view_manager .oe_view_manager_view_kanban { height: inherit; } @@ -2522,6 +2519,9 @@ .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page { display: none !important; } +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_view_list, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_view_list { + min-height: 132px; +} .openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add { font-weight: bold; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1f1993ff74d..733bd9c0845 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1070,8 +1070,6 @@ $sheet-max-width: 860px .oe_view_manager .oe_view_manager_body height: inherit - .oe_view_manager_view_list - min-height: 132px .oe_view_manager_view_kanban height: inherit @@ -1985,6 +1983,9 @@ $sheet-max-width: 860px > .oe_view_manager .oe_list_pager_single_page display: none !important + .oe_view_manager_view_list + min-height: 132px + .oe_form_field_one2many_list_row_add font-weight: bold .oe_list_content diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 2819be453fb..bc381df4b2f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2539,7 +2539,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc if (! this.get("effective_readonly")) { self._updating_editor = false; this.$textarea = this.$el.find('textarea'); - var width = ((this.node.attrs || {}).editor_width || 468); + var width = ((this.node.attrs || {}).editor_width || '100%'); var height = ((this.node.attrs || {}).editor_height || 250); this.$textarea.cleditor({ width: width, // width not including margins, borders or padding |