[Pkg-owncloud-commits] [owncloud] 60/69: Set "ie" CSS class for IE10, IE11

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 0c813ce231a6980438c0ae857c6b91f5164f5163
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Nov 10 14:05:05 2015 +0100

    Set "ie" CSS class for IE10, IE11
    
    Fixed border in file action menu
---
 core/css/apps.css | 7 ++++++-
 core/js/js.js     | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index ee68c45..33bcbf0 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -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 {
diff --git a/core/js/js.js b/core/js/js.js
index 460f652..07320a1 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git