diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/web/static/src/css/base.sass | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/web/static/src/css/base.sass')
| -rw-r--r-- | addons/web/static/src/css/base.sass | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f1f948170e5..38e3ebf40ce 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -239,8 +239,7 @@ $sheet-padding: 16px td vertical-align: top .oe_title - width: 38% - float: left + float: left .oe_title:after content: "." display: block @@ -529,19 +528,19 @@ $sheet-padding: 16px height: 16px &.oe_vertical label - margin-left: 4px - &.oe_form_required - .oe_radio_input - border: 2px solid transparent display: inline-block - height: 12px - width: 12px - vertical-align: top - border-radius: 10px - margin: 1px 0 - &.oe_form_invalid - .oe_radio_input - border-color: red + margin-left: 20px + .oe_radio_input + border: 2px solid transparent + display: inline-block + height: 12px + width: 12px + vertical-align: top + border-radius: 10px + margin: 1px 0 + position: absolute + &.oe_form_required.oe_form_invalid .oe_radio_input + border-color: red .oe_tags &.oe_inline min-width: 250px @@ -1762,8 +1761,6 @@ $sheet-padding: 16px white-space: nowrap .oe_form_field_boolean width: auto - .oe_datepicker_container - display: none .oe_datepicker_root display: inline-block .oe_form_required |