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

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7) 2013-07-23 22:28:54 +02:00
commit 6abf3556fd
4 changed files with 47 additions and 3 deletions

View file

@ -443,7 +443,10 @@ img.iconsmall {
margin-right: 0.5em;
display: inline;
}
.dir-rtl .form-item .form-setting .defaultsnext {
margin-left: 0.5em;
margin-right: 0;
}
.form-item .form-setting .locked-checkbox {
margin-right: 0.2em;
margin-left: 0.5em;

View file

@ -150,6 +150,12 @@ input#id_externalurl {
.mform .fitem div.fitemtitle {
.form-horizontal .control-label
}
.dir-rtl {
.form-item .form-label,
.mform .fitem div.fitemtitle {
float:right;
}
}
.form-defaultinfo,
.form-label .form-shortname {
.muted;
@ -341,6 +347,9 @@ input[type="checkbox"] {
.form-item .form-label label {
margin-bottom: 0;
}
.dir-rtl .form-item .form-label label {
text-align:left;
}
.felement.ffilepicker {
margin-top: 5px;
}

View file

@ -33,6 +33,19 @@
.form-horizontal .controls {
margin-left: @horizontalComponentOffset980;
}
.dir-rtl {
.form-item .form-setting,
.form-item .form-description,
.mform .fitem .felement,
.mform .fdescription.required,
.userprofile dl.list dd,
.form-horizontal .controls {
margin-right: @horizontalComponentOffset980;
}
}
#page-mod-forum-search.dir-lrt .c1 {
margin-right: @horizontalComponentOffset980;
}
.path-admin .buttons,
.form-buttons {
padding-left: @horizontalComponentOffset980;
@ -66,10 +79,29 @@
.form-horizontal .controls {
margin-left: @horizontalComponentOffset1200;
}
.dir-rtl {
.form-item .form-setting,
.form-item .form-description,
.mform .fitem .felement,
.mform .fdescription.required,
.userprofile dl.list dd,
.form-horizontal .controls {
margin-right: @horizontalComponentOffset1200;
}
#page-mod-forum-search .c1 {
margin-right: @horizontalComponentOffset1200;
}
}
.path-admin .buttons,
.form-buttons {
padding-left: @horizontalComponentOffset1200;
}
.dir-rtl {
.path-admin .buttons,
.form-buttons {
padding-right: @horizontalComponentOffset1200;
}
}
}

File diff suppressed because one or more lines are too long