Permalink
Browse files

Merge branch 'MDL-40752-26' of git://github.com/phalacee/moodle into …

…MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
danpoltawski committed Jan 20, 2014
2 parents 9c1c9d8 + f4075b7 commit 0b8749c89217bf0c2823fc205ad498f9d6bbcd14
@@ -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;

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 0b8749c

Please sign in to comment.