Merge branch 'MDL-52800-master' of git://github.com/ryanwyllie/moodle

This commit is contained in:
Andrew Nicols 2016-05-11 11:08:55 +08:00
commit f092c0881d
3 changed files with 12 additions and 23 deletions

View File

@ -2468,20 +2468,6 @@ dd:after {
cursor: pointer;
}
span.inplaceeditable.inplaceeditingon {
position: relative;
}
span.inplaceeditable.inplaceeditingon span.editinstructions {
margin-top: -30px;
font-weight: normal;
margin-right: -300px;
margin-left: 0;
}
.dir-rtl span.inplaceeditable.inplaceeditingon span.editinstructions {
margin-left: -300px;
margin-right: 0;
}
.inplaceeditable {
&.inplaceeditingon {
@ -2490,8 +2476,11 @@ span.inplaceeditable.inplaceeditingon span.editinstructions {
.editinstructions {
margin-top: -30px;
font-weight: normal;
margin-right: -300px;
margin-right: 0;
margin-left: 0;
left: 0;
right: auto;
white-space: nowrap;
}
input {
@ -2525,11 +2514,13 @@ span.inplaceeditable.inplaceeditingon span.editinstructions {
}
}
.dir-rtl .inplaceeditable {
&.inplaceeditingon {
.editinstructions {
margin-left: -300px;
margin-right: 0;
.dir-rtl {
.inplaceeditable {
&.inplaceeditingon {
.editinstructions {
right: 0;
left: auto;
}
}
}
}

View File

@ -515,8 +515,6 @@ span.editinstructions {
.box-shadow(2px 2px 5px 1px #ccc);
border: 1px solid @infoBorder;
}
.dir-rtl span.editinstructions {
}
/* Course drag and drop upload styles */
#dndupload-status {

File diff suppressed because one or more lines are too long