Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle

2017-11-10 10:55:09 +08:00
parent f5b63fc829 fb5bbf1424
commit 6b2a9a6fb8
3 changed files with 11 additions and 5 deletions
@@ -1933,7 +1933,6 @@ dd:after {
 }

 .inplaceeditable {
-    display: block;
    &.inplaceeditingon {
        position: relative;

@@ -1975,6 +1974,10 @@ dd:after {
    &.inplaceeditable-toggle .quickediticon {
        display: none;
    }
+
+    &.inplaceeditable-autocomplete {
+        display: block;
+    }
 }

 h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
@@ -2257,7 +2257,6 @@ dd:after {
 }

 .inplaceeditable {
-    display: block;
    &.inplaceeditingon {
        position: relative;

@@ -2300,6 +2299,10 @@ dd:after {
    &.inplaceeditable-toggle .quickediticon {
        display: none;
    }
+
+    &.inplaceeditable-autocomplete {
+        display: block;
+    }
 }

 h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
@@ -4674,9 +4674,6 @@ dd:after {
 .nav-tabs > .active > a[href]:focus {
  cursor: pointer;
 }
-.inplaceeditable {
-  display: block;
-}
 .inplaceeditable.inplaceeditingon {
  position: relative;
 }
@@ -4712,6 +4709,9 @@ dd:after {
 .inplaceeditable.inplaceeditable-toggle .quickediticon {
  display: none;
 }
+.inplaceeditable.inplaceeditable-autocomplete {
+  display: block;
+}
 h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
  margin-top: -20px;
 }