diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-05-29 15:06:25 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-05-29 15:06:25 +0200 |
| commit | efe28673307f8b27de43a147278a53228c2e58d4 (patch) | |
| tree | 67ee3487006ea2c93d0e51f370ce135a4c49edb3 /addons/web/static/src/css | |
| parent | 23b63eaf8ac61d04b46decec905c64e324bc089a (diff) | |
| parent | 9d7d7f668b1c169dd731f7fd72bcaf4a83f04b5e (diff) | |
[MERGE] Merge trunk-fp
bzr revid: fme@openerp.com-20120529130625-t8l9xgdnbfc8qsu4
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 11 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 89b8cc1a38f..6eeeac715d6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1607,6 +1607,11 @@ top: -4px; padding: 0 2px; } +.openerp .oe_form h2 input { + font-size: 20px; + font-weight: bold; + height: 30px; +} .openerp .oe_form textarea { resize: vertical; } @@ -1767,6 +1772,7 @@ .openerp .oe_form .oe-binary-file-set { overflow: hidden; position: relative; + display: inline-block; width: 45px; height: 30px; } @@ -1895,11 +1901,6 @@ .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { display: none; } -.openerp .oe_form .oe_form_title, .openerp .oe_form .oe_form_title input { - font-size: 20px; - font-weight: bold; - height: 30px; -} .openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd), .openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label { border-right: 1px solid #dddddd; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e013009f9b1..e8e5b36bce8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1305,6 +1305,10 @@ $colour4: #8a89ba // }}} // FormView.fields {{{ .oe_form + h2 input + font-size: 20px + font-weight: bold + height: 30px textarea resize: vertical input[type="text"], @@ -1448,6 +1452,7 @@ $colour4: #8a89ba .oe-binary-file-set overflow: hidden position: relative + display: inline-block width: 45px height: 30px input.oe-binary-file @@ -1567,10 +1572,6 @@ $colour4: #8a89ba // }}} // FormView.classes for openerp views {{{ .oe_form - .oe_form_title, .oe_form_title input - font-size: 20px - font-weight: bold - height: 30px .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd), .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label border-right: 1px solid #ddd |