diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:17:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:17:54 +0200 |
| commit | 2cf91d16a5f844a2a3d5d22c025c180a6615bab8 (patch) | |
| tree | a7bc3974a9c349ae1575fd3b10bbb25d9b74b9ab /addons/web/static/src/css | |
| parent | d74e0c3e9d9cd80bf532ba90f7c634ff55881b51 (diff) | |
| parent | 63e92cbc9621813a276e340b7d961cbd8f8b97c4 (diff) | |
[MERGE] forward port of branch saas-6 up to 63e92cb
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 2 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 72a89d001e9..65bd414cefa 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -551,6 +551,7 @@ border-radius: 3px; background: #f0f0fa; color: #4C4C4C; + display: inline-block; word-break: break-word; } .openerp .oe_tag_dark { @@ -590,6 +591,7 @@ } .openerp .oe_tags .text-wrap { width: 100% !important; + position: static; } .openerp .oe_tags .text-wrap textarea { width: 100% !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 03aeec7e04f..b844f1a8929 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -502,6 +502,7 @@ $sheet-padding: 16px @include radius(3px) background: $tag-bg-light color: #4C4C4C + display: inline-block word-break: break-word .oe_tag_dark background: $tag-bg-dark @@ -533,6 +534,7 @@ $sheet-padding: 16px min-width: 250px .text-wrap width: 100% !important + position: static textarea width: 100% !important .text-core |