diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-04-17 11:01:53 +0200 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2014-04-17 11:01:53 +0200 |
| commit | 77172b410bb9dd2ca457f4718b6d8ec38243437f (patch) | |
| tree | fb8a5c9ca94d4f6a889fa2035ce628c04b3a3ff6 /addons/web/static/src/css | |
| parent | 347985e050a7163781a81e3344a130ffaa520e14 (diff) | |
| parent | 7990c39127bf7204769ae93a257b00c583a221ac (diff) | |
[MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20140417090153-m6d65ubew0wlr9ic
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 15 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 10 |
2 files changed, 22 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 990d0fdfdb2..7bd39ff4632 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -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"); @@ -352,9 +352,17 @@ width: 37px; text-align: center; } +.openerp .oe_button_box .oe_stat_button .oe_form_field_percent_pie { + width: 42px; +} +.openerp .oe_button_box .oe_stat_button .oe_form_field_bar_chart { + width: 42px; +} .openerp .oe_button_box .oe_stat_button svg { width: 38px; height: 38px; + display: inline; + vertical-align: middle; } .openerp .oe_avatar > img { max-height: 90px; @@ -2734,7 +2742,7 @@ padding: 3px 6px; white-space: pre-line; } -.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { +.openerp .oe_list_content > tbody > tr > td > button.btn_img, .openerp .oe_list_content > tbody > tr > th > button.btn_img { border: none; background: transparent; padding: 0; @@ -3348,6 +3356,9 @@ body.oe_single_form .oe_single_form_container { .modal .oe_act_window.modal-body{ padding: 0; } +.modal .oe_button{ + margin: 0 4px 0 0; +} input[type="radio"], input[type="checkbox"] { margin-right: 4px; margin-left: 4px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 47a4a3984cc..3c538241f8c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -362,9 +362,15 @@ $sheet-padding: 16px padding: 0px 3px width: 37px text-align: center + .oe_form_field_percent_pie + width: 42px + .oe_form_field_bar_chart + width: 42px svg width: 38px height: 38px + display: inline + vertical-align: middle .oe_avatar > img max-height: 90px @@ -2214,7 +2220,7 @@ $sheet-padding: 16px padding: 3px 6px white-space: pre-line > td, > th - > button + > button.btn_img border: none background: transparent padding: 0 @@ -2725,6 +2731,8 @@ body.oe_single_form font-size: 20px .modal-footer text-align: left + .oe_button + margin: 0 4px 0 0 .oe_act_window.modal-body padding: 0 |