mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Marina Glancy 2014-08-19 16:51:46 +08:00
commit e913caab92
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
theme/base/style/core.css
View File

@ -451,8 +451,7 @@ input#id_externalurl {direction:ltr;}
.loginbox .potentialidps .potentialidplist {margin-left:40%;}
.loginbox .potentialidps .potentialidplist div {text-align:left;}
.loginbox .loginform {margin-top:1em;text-align:left;}
.loginbox .loginform .form-label {float:left;text-align:right;width:49%;direction:rtl; white-space:nowrap;}
.dir-rtl .loginbox .loginform .form-label {float:left;text-align:right;width:49%;direction:ltr; white-space:nowrap;}
.loginbox .loginform .form-label {float:left;text-align:right;width:49%;white-space:nowrap;}
.loginbox .loginform .form-input {float:right;width:50%;}
.dir-rtl .loginbox .loginform .form-input {margin-right: 1%;}
.loginbox .loginform .form-input input {width: 6em;}

8
theme/bootstrapbase/less/moodle/core.less
View File

@ -500,14 +500,6 @@ a.skip:active {
float: left;
text-align: right;
width: 49%;
direction: rtl;
white-space: nowrap;
}
.dir-rtl .loginbox .loginform .form-label {
float: left;
text-align: right;
width: 49%;
direction: ltr;
white-space: nowrap;
}
.loginbox .loginform .form-input {

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long