Commit b1731245 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #20434 from owncloud/set-ie-class-for-ie10plus

Set "ie" CSS class for IE10, IE11
parents 0c46f75f a2cd9708
......@@ -307,10 +307,15 @@
-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
}
.ie .bubble,
.ie #app-navigation .app-navigation-entry-menu,
.ie .bubble:after,
.ie #app-navigation .app-navigation-entry-menu:after {
.ie #app-navigation .app-navigation-entry-menu:after,
.edge .bubble,
.edge #app-navigation .app-navigation-entry-menu,
.edge .bubble:after,
.edge #app-navigation .app-navigation-entry-menu:after {
border: 1px solid #eee;
}
.ie8 .bubble {
......
......@@ -1236,6 +1236,14 @@ function initCore() {
*/
moment.locale(OC.getLocale());
if ($.browser.msie || !!navigator.userAgent.match(/Trident\/7\./)) {
// for IE10+ that don't have conditional comments
// and IE11 doesn't identify as MSIE any more...
$('html').addClass('ie');
} else if (!!navigator.userAgent.match(/Edge\/12/)) {
// for edge
$('html').addClass('edge');
}
/**
* Calls the server periodically to ensure that session doesn't
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment