diff options
| author | Olivier Dony <odo@openerp.com> | 2013-03-15 10:01:12 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-03-15 10:01:12 +0100 |
| commit | 8e06ab16d011bb1940be6bdaa298a4cbbf0d236a (patch) | |
| tree | d5e70e273e5ab34138bedffee65528c17411ff1c /addons/web/static/src/css | |
| parent | e23fba677e71511d5f9d2d03b84ff7472ce0dcca (diff) | |
| parent | dcc9a3aeabd304bd145c1d9156b06ba914a251d7 (diff) | |
[MERGE] Bugfixes from the 7.0 branch, up to rev. 3845
rev.3845 = launchpad_translations_on_behalf_of_openerp-20130315064417-68iimts1xgj8bn5z
bzr revid: odo@openerp.com-20130315090112-n4h5wpxk2sjhwvrd
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 26 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 20 |
2 files changed, 45 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d9b0d22c081..be0bb19748c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -355,6 +355,12 @@ float: right; margin-left: 8px; } +.openerp .oe_text_center { + text-align: center; +} +.openerp .oe_text_left { + text-align: left; +} .openerp .oe_text_right { text-align: right; } @@ -2228,6 +2234,26 @@ .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; } +.openerp .oe_form .oe_form_box_info { + background: #ffee99; + border-bottom: 1px solid #ccbb66; + padding: 4px; +} +.openerp .oe_form .oe_form_box_info > p { + margin: auto; +} +.openerp .oe_form .oe_form_box_warning { + background: #bd362f; + border-bottom: 1px solid #990000; + padding: 4px; +} +.openerp .oe_form .oe_form_box_warning * { + color: white; + text-shadow: none; +} +.openerp .oe_form .oe_form_box_warning > p { + margin: auto; +} .openerp .oe_form .oe_form_button { margin: 2px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8544cf0dd3c..e2c047f11e1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -370,6 +370,10 @@ $sheet-padding: 16px .oe_right float: right margin-left: 8px + .oe_text_center + text-align: center + .oe_text_left + text-align: left .oe_text_right text-align: right .oe_clear @@ -1760,7 +1764,21 @@ $sheet-padding: 16px padding: 2px 11px 2px 0px !important label.oe_form_label_help font-weight: normal - + .oe_form_box_info + background: #fe9 + border-bottom: 1px solid #cb6 + padding: 4px + > p + margin: auto + .oe_form_box_warning + background: #bd362f + border-bottom: 1px solid #900 + padding: 4px + * + color: white + text-shadow: none + > p + margin: auto // }}} // FormView.group {{{ .oe_form |