Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski
2013-08-27 15:47:52 +08:00
3 changed files with 5 additions and 7 deletions
@@ -208,6 +208,7 @@
}
.dir-rtl .fp-toolbar div {
width: 100px;
padding-right: 0px;
}
.fp-toolbar img {
vertical-align: -15%;
+2 -5
View File
@@ -172,6 +172,7 @@ input#id_externalurl {
.form-item .form-label,
.mform .fitem div.fitemtitle {
float:right;
text-align: left;
}
}
.form-defaultinfo,
@@ -250,12 +251,8 @@ div.backup-section + form,
color: @grayDark;
text-decoration: none;
}
.dir-rtl .mform .fitem .fitemtitle {
float: right;
}
.dir-rtl .mform .fitem .felement {
margin-right: 16%;
margin-right: 30%;
margin-left: auto;
text-align: right;
}
File diff suppressed because one or more lines are too long