L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-59294 theme_bootstrapbase: Fix display of ID provider buttons

Browse Source
This commit is contained in:
Jun Pataleta
2017-06-28 13:39:02 +08:00
parent 62c58d22be
commit e29ea1b2c9
3 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/templates/login.mustache
+15 -15
View File
@@ -124,21 +124,20 @@
</div>
<div class="signuppanel">
{{#hasinstructions}}
<div class="signuppanel">
<h2>{{#str}} firsttime {{/str}}</h2>
<div class="subcontent">
{{{instructions}}}
{{#cansignup}}
<div class="signupform">
<form action="{{signupurl}}" method="get" id="signup">
<div>
<input type="submit" value={{#quote}}{{#str}} startsignup {{/str}}{{/quote}} />
</div>
</form>
</div>
{{/cansignup}}
</div>
<h2>{{#str}} firsttime {{/str}}</h2>
<div class="subcontent">
{{{instructions}}}
{{#cansignup}}
<div class="signupform">
<form action="{{signupurl}}" method="get" id="signup">
<div>
<input type="submit" value={{#quote}}{{#str}} startsignup {{/str}}{{/quote}} />
</div>
</form>
</div>
{{/cansignup}}
</div>
{{/hasinstructions}}
@@ -148,7 +147,7 @@
<div class="potentialidplist">
{{#identityproviders}}
<div class="potentialidp">
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}}>
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn">
{{#icon}}
{{>core/pix_icon}}
{{/icon}}
@@ -159,6 +158,7 @@
</div>
</div>
{{/hasidentityproviders}}
</div>
</div>
{{#js}}
theme/bootstrapbase/less/moodle/core.less
+4 -12
View File
@@ -497,24 +497,14 @@ a.skip:active {
margin-bottom: 5px;
margin-top: 15px;
}
.loginbox .signuppanel .subcontent {
text-align: left;
}
.loginbox .loginsub {
margin-left: 0;
margin-right: 0;
}
.loginbox .guestsub,
.loginbox .forgotsub,
.loginbox .potentialidps {
.loginbox .forgotsub {
margin: 5px 12%;
}
.loginbox .potentialidps .potentialidplist {
margin-left: 40%;
}
.loginbox .potentialidps .potentialidplist div {
text-align: left;
}
.loginbox .loginform {
margin-top: 1em;
text-align: left;
@@ -550,7 +540,9 @@ a.skip:active {
margin-bottom: -2000px;
padding-bottom: 2000px;
}
.loginbox .potentialidp {
margin-bottom: 0.3em;
}
.loginbox .potentialidp .smallicon {
vertical-align: text-bottom;
margin: 0 .3em;
theme/bootstrapbase/style/moodle.css
+4 -11
View File
@@ -457,24 +457,14 @@ a.skip:active {
margin-bottom: 5px;
margin-top: 15px;
}
.loginbox .signuppanel .subcontent {
text-align: left;
}
.loginbox .loginsub {
margin-left: 0;
margin-right: 0;
}
.loginbox .guestsub,
.loginbox .forgotsub,
.loginbox .potentialidps {
.loginbox .forgotsub {
margin: 5px 12%;
}
.loginbox .potentialidps .potentialidplist {
margin-left: 40%;
}
.loginbox .potentialidps .potentialidplist div {
text-align: left;
}
.loginbox .loginform {
margin-top: 1em;
text-align: left;
@@ -512,6 +502,9 @@ a.skip:active {
margin-bottom: -2000px;
padding-bottom: 2000px;
}
.loginbox .potentialidp {
margin-bottom: 0.3em;
}
.loginbox .potentialidp .smallicon {
vertical-align: text-bottom;
margin: 0 .3em;