Merge branch 'MDL-52800-30' of git://github.com/ryanwyllie/moodle into MOODLE_30_STABLE

2016-05-11 11:16:00 +08:00
parent 3945629232 42defe4dc1
commit c768daa20b
3 changed files with 22 additions and 2 deletions
@@ -858,8 +858,11 @@ tr.flagged-tag a {
    position: relative;
 }
 .tag-management-table tr td.tageditingon .edittagname .editinstructions {
-    margin-right: -300px;
+    margin-right: 0;
    margin-left: 0;
+    left: 0;
+    right: auto;
+    white-space: nowrap;
 }
 .tag-management-table tr td .tagnameedit img {
    opacity: 0.2;
@@ -1196,6 +1199,21 @@ body.tag .managelink {
 /**
 * Overide for RTL layout
 **/
+.dir-rtl {
+    .tag-management-table {
+        tr {
+            td.tageditingon {
+                .edittagname {
+                    .editinstructions {
+                        right: 0;
+                        left: auto;
+                    }
+                }
+            }
+        }
+    }
+}
+
 .dir-rtl .headermain {
    float: right;
 }
@@ -516,6 +516,8 @@ span.editinstructions {
    border: 1px solid @infoBorder;
 }
 .dir-rtl span.editinstructions {
+    margin-right: 30px;
+    margin-left: auto;
 }

 /* Course drag and drop upload styles */