diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-01-23 14:33:53 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-01-23 14:33:53 +0100 |
| commit | 6c4389df41fb29f9707b205a8dcca13b3bf8a322 (patch) | |
| tree | b06358fdcff3268574c9ccda8cb36d9f94eb09dd /addons/website/static/src/less | |
| parent | 255de893300d73670a15a102e85162ae48084d7c (diff) | |
| parent | 6804085b8ceb1411a23db65477f84a959f8c5bf7 (diff) | |
[MERGE] forward port branch 10.0 up to 6804085b8ce
Diffstat (limited to 'addons/website/static/src/less')
| -rw-r--r-- | addons/website/static/src/less/website.snippets.less | 1 | ||||
| -rw-r--r-- | addons/website/static/src/less/website.wrapwrap.less | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/addons/website/static/src/less/website.snippets.less b/addons/website/static/src/less/website.snippets.less index 1a290e65767..4a9e304299f 100644 --- a/addons/website/static/src/less/website.snippets.less +++ b/addons/website/static/src/less/website.snippets.less @@ -112,7 +112,6 @@ table.table_desc tr td { height: 100%; .item { height: 100%; - background-size: cover; } .carousel-control { cursor: pointer; diff --git a/addons/website/static/src/less/website.wrapwrap.less b/addons/website/static/src/less/website.wrapwrap.less index 9151e26e7ba..e572a11a975 100644 --- a/addons/website/static/src/less/website.wrapwrap.less +++ b/addons/website/static/src/less/website.wrapwrap.less @@ -37,6 +37,16 @@ footer { display: none!important; } +.o_text_overflow { + .text-overflow() +} + +.o_div_text_overflow * > div { + // .text-overflow() we don't want wordwrap + overflow: hidden; + text-overflow: ellipsis; +} + // Odoo options classes .jumbotron { |