SAK-31260 - Sakai 11 RTL layout Issue

gexingfeiyang · May 26, 2016 · 09ce256 · 09ce256
1 parent a0f4b60
commit 09ce256
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/reference/library/src/morpheus-master/sass/base/_rtl.scss b/reference/library/src/morpheus-master/sass/base/_rtl.scss
@@ -2,7 +2,15 @@
 
 html[dir="rtl"]{
 
+	overflow-x: hidden;
+
 	.#{$namespace}siteHierarchy{
+		.#{$namespace}hierarchy--separator{
+			transform: rotate(180deg);
+			position: relative;
+			top: 0;
+			left: -4px;
+		}
 		&:after{
 			content: " ";
 			clear: both;
@@ -56,7 +64,7 @@ html[dir="rtl"]{
 	    float: left;
 	}
 
-	#mastLogin #loginLinks ul, #linkNav ul li.#{$namespace}sitesNav__menuitem ul {
+	#mastLogin #loginLinks ul{
 	    left: 0;
 	    right: auto;
 	    text-align: right;
@@ -67,6 +75,17 @@ html[dir="rtl"]{
 			}
 		}
 	}
+	#linkNav ul li.#{$namespace}sitesNav__menuitem ul {
+	    left: auto;
+	    right: auto;
+	    text-align: right;
+		@media #{$phone}{
+			left: 9.8em;
+			> * {
+				position: relative;
+			}
+		}
+	}
 
 	#mastLogin #loginLinks ul:after {
 	    left: 8%;
@@ -83,4 +102,13 @@ html[dir="rtl"]{
 		}
 	}
 
+	.#{$namespace}sakai-profile2 {
+
+		@media (min-width: 992px){
+			.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+			    float: right;
+			}
+		}
+	}
+
 }
diff --git a/reference/library/src/morpheus-master/sass/modules/more-sites/_base.scss b/reference/library/src/morpheus-master/sass/modules/more-sites/_base.scss
@@ -50,7 +50,7 @@ body.active-more-sites{
 	&.outscreen{
 		left: 110%;
 		max-width: 100%;
-		display: none;
+		display: none !important; //Important added by SAK-31260
 		@media #{$phone}{
 			display: none;
 		}
@@ -369,6 +369,9 @@ ul.favoriteSiteList{
 	.favorites-mobile{
 		display: none;
 	}
+	.favoriteCount{
+		display: inline-block;
+	}
 
 	@media #{$phone}{
 		.favorites-desktop{