diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-02-17 18:54:52 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-02-17 18:54:52 +0100 |
| commit | 1b3fb3c4a8fbda32ba708471fc1d379ee796e557 (patch) | |
| tree | 844f0ce4c04b8af79b30893ce4015d13f3b0bce1 /addons/website/static/src | |
| parent | 663956ec1b8982d5d5725d8441b0dc4de5fd1898 (diff) | |
| parent | 222b2d337038a60f89b8825b24e61a20ef4f35f7 (diff) | |
[MERGE] forward port of branch 8.0 up to 222b2d3
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/website.css | 4 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 3 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.js | 12 |
3 files changed, 19 insertions, 0 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index b04a3e13f4c..473ea32f268 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -869,6 +869,10 @@ div.media_iframe_video .css_editable_mode_display { z-index: 2; } +html[data-browser^="msie"] div.media_iframe_video iframe { + margin-left: 0; +} + /* Mobile view */ @media (max-width: 768px) { img:not(.cke_iframe), .media_iframe_video, span.fa, i.fa { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 1da84f5192d..85259178e15 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -685,6 +685,9 @@ div.media_iframe_video display: none z-index: 2 +html[data-browser^="msie"] div.media_iframe_video iframe + margin-left: 0 + /* Mobile view */ @media (max-width: 768px) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 6fc8874865a..667dd139372 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -1,6 +1,18 @@ (function() { "use strict"; + /* --- Set the browser into the dom for css selectors --- */ + var browser; + if ($.browser.webkit) browser = "webkit"; + else if ($.browser.safari) browser = "safari"; + else if ($.browser.opera) browser = "opera"; + else if ($.browser.msie || ($.browser.mozilla && +$.browser.version.replace(/^([0-9]+\.[0-9]+).*/, '\$1') < 20)) browser = "msie"; + else if ($.browser.mozilla) browser = "mozilla"; + browser += ","+$.browser.version; + if (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase())) browser += ",mobile"; + document.documentElement.setAttribute('data-browser', browser); + /* ---------------------------------------------------- */ + var website = {}; openerp.website = website; |