diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-06-18 19:41:31 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-06-18 19:41:31 +0200 |
| commit | 13468c271f47f694149dac1adcdf06b2e90db752 (patch) | |
| tree | 774c26f2c8bb68f62d2d8cf6f3c0441f3c8de284 /addons/web/static | |
| parent | 1b7c49bf1e0843c1d11c856ef5474ebfc2c261d1 (diff) | |
| parent | ed3065e3c6613162513638945e760f686fea2b55 (diff) | |
[MERGE] forward port of branch 8.0 up to ed3065e
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/css/base.css | 4 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d9c17ea6465..14edf1cf14d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -577,6 +577,7 @@ border-radius: 3px; background: #f0f0fa; color: #4C4C4C; + word-break: break-word; } .openerp .oe_tag_dark { background: #7C7BAD; @@ -620,7 +621,8 @@ width: 100% !important; } .openerp .oe_tags .text-core { - min-height: 22px; + height: initial !important; + word-break: break-word; } .openerp .oe_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em { font-style: italic; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ac4742f2598..30ff7e83c0e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -514,6 +514,7 @@ $sheet-padding: 16px @include radius(3px) background: $tag-bg-light color: #4C4C4C + word-break: break-word .oe_tag_dark background: $tag-bg-dark color: #eee @@ -547,7 +548,8 @@ $sheet-padding: 16px textarea width: 100% !important .text-core - min-height: 22px + height: initial !important + word-break: break-word .text-wrap .text-dropdown .text-list .text-suggestion em font-style: italic text-decoration: none |