diff options
| author | Minh Tran <mit@openerp.com> | 2012-09-03 13:12:31 +0200 |
|---|---|---|
| committer | Minh Tran <mit@openerp.com> | 2012-09-03 13:12:31 +0200 |
| commit | 0e16327c34ba29b48a210b503cb1f9413be6dfd3 (patch) | |
| tree | 0b0d230bb279eae7920e4ccde15369c006c4a7b2 /addons/web/static/src/css | |
| parent | 723d2ee1daaf2d709926f0ea1bce6c5ba334285d (diff) | |
| parent | 1699e4dc97f4472dee01852dcd131f60d1817771 (diff) | |
merge from trunk
bzr revid: mit@openerp.com-20120903111231-gpw527k8dvht5u3k
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 6 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index dcb3fd958f4..b1c6348b2ad 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -502,6 +502,7 @@ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); border: none; + margin-bottom: 10px; } .openerp .oe_avatar + div { margin-left: 5px; @@ -574,6 +575,9 @@ background: #7c7bad; color: #eeeeee; } +.openerp .oe_tags { + margin-bottom: 1px; +} .openerp .oe_tags.oe_inline { min-width: 250px; } @@ -2156,7 +2160,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 160px; + min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 43b8ace724b..1b6a1b3d766 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -422,6 +422,7 @@ $sheet-max-width: 860px @include radius(3px) @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) border: none + margin-bottom: 10px .oe_avatar + div margin-left: 5px .oe_image_small > img @@ -475,6 +476,7 @@ $sheet-max-width: 860px .text-core .text-wrap .text-dropdown .text-list .text-suggestion em font-style: italic text-decoration: none + margin-bottom: 1px // }}} // Tooltips {{{ &.oe_tooltip @@ -1650,7 +1652,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 160px + min-width: 140px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group |