Merge branch 'release/2.1.8'

Author: VaLeXaR

assets/scripts/language-switcher.js

@@ -2,11 +2,9 @@
   "use strict";
 
   $(function () {
-
     if ($('#wpm-language-switcher').length === 0) {
       var language_switcher = wp.template('wpm-ls');
-      $('#wpbody-content .wrap').first().prepend(language_switcher);
+      $('#wpbody-content > .wrap').prepend(language_switcher);
     }
-
   });
 })(jQuery, wp);

assets/scripts/language-switcher.min.js

@@ -112,3 +112,7 @@
 	position: absolute;
 	top: 0;
 }
+
+.screen-meta-toggle {
+	z-index: 1;
+}

assets/styles/admin/admin.css

@@ -3,23 +3,28 @@
 	margin-bottom: 0;
 	padding-left: 0;
 
-	a {
-		color: lighten($black, 20%);
+	li {
 
-		&:hover {
-			color: $black;
-		}
+		a,
+		> span {
+			color: lighten($black, 20%);
 
-		img {
-			display: inline-block;
-			margin-right: 3px;
+			&:hover {
+				color: $black;
+			}
+
+			img {
+				display: inline-block;
+				margin-right: 3px;
+			}
 		}
-	}
 
-	.active {
+		&.active {
 
-		a {
-			color: $black;
+			a,
+			> span {
+				color: $black;
+			}
 		}
 	}
 }
@@ -30,6 +35,7 @@
 	padding-left: 0;
 	position: relative;
 
+	a,
 	span {
 
 		img {
@@ -44,11 +50,6 @@
 		&:hover {
 			color: $black;
 		}
-
-		img {
-			display: inline-block;
-			margin-right: 3px;
-		}
 	}
 
 	.language-dropdown {