Set "ie" CSS class for IE10, IE11

Fixed border in file action menu
This commit is contained in:
Vincent Petry 2015-11-10 14:05:05 +01:00
parent d7232557d9
commit a2cd9708f6
2 changed files with 14 additions and 1 deletions

View File

@ -307,10 +307,15 @@
-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); -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)); filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
} }
.ie .bubble, .ie .bubble,
.ie #app-navigation .app-navigation-entry-menu, .ie #app-navigation .app-navigation-entry-menu,
.ie .bubble:after, .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; border: 1px solid #eee;
} }
.ie8 .bubble { .ie8 .bubble {

View File

@ -1236,6 +1236,14 @@ function initCore() {
*/ */
moment.locale(OC.getLocale()); 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 * Calls the server periodically to ensure that session doesn't