diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-06-24 18:38:12 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-06-25 00:26:31 +0200 |
| commit | a3041949364141eaa66b22ab0d72227b675df324 (patch) | |
| tree | 6fd5ca7333bbcc908e35baee6acbd1040b2a9592 /addons/web/static/src/css | |
| parent | 07efacb5785434361608e22d43bab492a5102de4 (diff) | |
| parent | 81b5c601f9466e5e48e337c0d270ea4955cf181c (diff) | |
[MERGE] forward port of branch saas-6 up to 81b5c60
Diffstat (limited to 'addons/web/static/src/css')
| -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 26d23daf292..e0a46982ae4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -547,6 +547,7 @@ border-radius: 3px; background: #f0f0fa; color: #4C4C4C; + word-break: break-word; } .openerp .oe_tag_dark { background: #7C7BAD; @@ -590,7 +591,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 c253390870e..179220db575 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -499,6 +499,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 @@ -532,7 +533,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 |