mirror of
https://github.com/moodle/moodle.git
synced 2025-01-31 04:33:13 +01:00
Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle
Conflicts: theme/bootstrapbase/style/moodle.css
This commit is contained in:
commit
34e91c304c
@ -457,6 +457,7 @@ input#id_externalurl {direction:ltr;}
|
||||
.loginbox.twocolumns .loginpanel {float:left;width:49.5%;border-right: 1px solid;margin-bottom:-2000px;padding-bottom:2000px;}
|
||||
.loginbox.twocolumns .signuppanel {float:right;width:50%;margin-bottom:-2000px;padding-bottom:2000px;}
|
||||
.loginbox .potentialidp .smallicon { vertical-align: text-bottom; margin: 0 .3em; }
|
||||
.dir-rtl .loginbox.twocolumns .loginpanel, .dir-rtl.loginbox.twocolumns .signuppanel {float:right;}
|
||||
|
||||
/**
|
||||
* Notes
|
||||
|
@ -529,6 +529,13 @@ a.skip:active {
|
||||
margin-bottom: -2000px;
|
||||
padding-bottom: 2000px;
|
||||
}
|
||||
.dir-rtl {
|
||||
.loginbox.twocolumns .loginpanel,
|
||||
.loginbox.twocolumns .signuppanel {
|
||||
float:right;
|
||||
}
|
||||
}
|
||||
|
||||
.loginbox .potentialidp .smallicon {
|
||||
vertical-align: text-bottom;
|
||||
margin: 0 .3em;
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user