SAK-31731 Correct IE11 render of Favourites (#3585)

* SAK-31731 Correct IE11 render of Favourites. Stop IE11 rendering the favourites sites in a single row that extends under other elements on the page. * Revert "SAK-31731 - Favorite sites are all displayed on a single row in Internet Explorer (#3552)" This reverts commit 182d9d4.
JohnMMMM · Nov 21, 2016 · 0352050 · 0352050
1 parent 1c2c192
commit 0352050
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/reference/library/src/morpheus-master/js/src/sakai.morpheus.usernav.js b/reference/library/src/morpheus-master/js/src/sakai.morpheus.usernav.js
@@ -44,19 +44,9 @@ function toggleUserNav(event){
 $PBJQ(".js-toggle-user-nav a#loginUser > .Mrphs-userNav__drop-btn", "#loginLinks").on("click", toggleUserNav);
 $PBJQ(".js-toggle-user-nav .Mrphs-userNav__drop-btn", "#loginLinks").on("click", toggleUserNav);
 
-var ie11flex = function(){
-    if( !(window.ActiveXObject) && "ActiveXObject" in window && $PBJQ(window).width() >= 800 ){ // Failback for IE11
-      _list_width = $PBJQ(window).width() - $PBJQ('#mastLogin').outerWidth() - $PBJQ('.Mrphs-headerLogo').outerWidth();
-      $PBJQ('#Mrphs-sites-nav').css( 'width', ( _list_width  ) + 'px' );
-      $PBJQ('.Mrphs-sitesNav__menu','#Mrphs-sites-nav').css( 'width', ( _list_width ) + 'px' );
-    }
-}
-
 $PBJQ(document).ready( function(){
   if( $PBJQ('.Mrphs-hierarchy--parent-sites').length > 0 && $PBJQ(window).width() <= 800 ){
     $PBJQ('#content').css( 'margin-top', ( parseInt( $PBJQ('#content').css('margin-top').replace('px', '') ) +  $PBJQ('.Mrphs-hierarchy--parent-sites').outerHeight(true) ) + 'px' );
   }
-  ie11flex();
 });
 
-$PBJQ(window).on('resize', function(){ ie11flex(); });
diff --git a/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss b/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss
@@ -587,6 +587,7 @@ body.is-logged-out{
 }
 
 #linkNav{
+	@include display-flex(flex);
 	ul{
 		@include display-flex(flex);
 		@include flex-wrap( wrap );