diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-04 16:56:10 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-04 16:56:10 +0200 |
| commit | 1bb219907f483f8720fc23a6f589a9d56a3703b4 (patch) | |
| tree | c654a5dc869b2af81d1661eda366508015423bd3 /addons/website/static/src/css | |
| parent | 7b3e28dc741a36055d65a2980ceaa3204266db4a (diff) | |
| parent | 655a5b948dff9c9c0985a65b17e30c410866fd02 (diff) | |
[MERGE] forward port of branch saas-5 up to 655a5b9
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/website.css | 5 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 12ab72e96d3..8a03e1aeee6 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -522,12 +522,15 @@ div.media_iframe_video { div.media_iframe_video iframe { width: 100%; height: 100%; + position: absolute; + margin-left: -50%; } -div.media_iframe_video div { +div.media_iframe_video .css_editable_mode_display { position: absolute; width: 100%; height: 100%; display: none; + z-index: 2; } /* Mobile view */ diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 9364511b2df..21e184d5a91 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -99,7 +99,7 @@ header margin-right: 0 !important .css_non_editable_mode_hidden - display: none + display: none !important /* ----- BOOTSTRAP FIX ----- */ @@ -424,11 +424,14 @@ div.media_iframe_video iframe width: 100% height: 100% - div + position: absolute + margin-left: -50% + .css_editable_mode_display position: absolute width: 100% height: 100% display: none + z-index: 2 /* Mobile view */ |