moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-59294 theme_bootstrapbase: Fix display of ID provider buttons

Browse source
This commit is contained in:
Jun Pataleta 2017-06-26 15:59:25 +08:00
parent f4a2d69631
commit 7c482415a9
3 changed files with 27 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/templates/loginform.mustache
View file

@ -123,21 +123,20 @@
</div> </div>
<div class="signuppanel">
{{#hasinstructions}} {{#hasinstructions}}
<div class="signuppanel"> <h2>{{#str}} firsttime {{/str}}</h2>
<h2>{{#str}} firsttime {{/str}}</h2> <div class="subcontent">
<div class="subcontent"> {{{instructions}}}
{{{instructions}}} {{#cansignup}}
{{#cansignup}} <div class="signupform">
<div class="signupform"> <form action="{{signupurl}}" method="get" id="signup">
<form action="{{signupurl}}" method="get" id="signup"> <div>
<div> <input type="submit" value={{#quote}}{{#str}} startsignup {{/str}}{{/quote}} />
<input type="submit" value={{#quote}}{{#str}} startsignup {{/str}}{{/quote}} /> </div>
</div> </form>
</form> </div>
</div> {{/cansignup}}
{{/cansignup}}
</div>
</div> </div>
{{/hasinstructions}} {{/hasinstructions}}
@ -147,17 +146,18 @@
<div class="potentialidplist"> <div class="potentialidplist">
{{#identityproviders}} {{#identityproviders}}
<div class="potentialidp"> <div class="potentialidp">
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}}> <a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn">
{{#iconurl}} {{#iconurl}}
<img src="{{iconurl}}" alt="" width="24" height="24"/> <img src="{{iconurl}}" alt="" width="24" height="24"/>
{{/iconurl}} {{/iconurl}}
{{name}} {{name}}
</a> </a>
</div> </div>
{{/identityproviders}} {{/identityproviders}}
</div> </div>
</div> </div>
{{/hasidentityproviders}} {{/hasidentityproviders}}
</div>
</div> </div>
{{#js}} {{#js}}

16
theme/bootstrapbase/less/moodle/core.less
View file

@ -505,24 +505,14 @@ a.skip:active {
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 15px; margin-top: 15px;
} }
.loginbox .signuppanel .subcontent {
text-align: left;
}
.loginbox .loginsub { .loginbox .loginsub {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
.loginbox .guestsub, .loginbox .guestsub,
.loginbox .forgotsub, .loginbox .forgotsub {
.loginbox .potentialidps {
margin: 5px 12%; margin: 5px 12%;
} }
.loginbox .potentialidps .potentialidplist {
margin-left: 40%;
}
.loginbox .potentialidps .potentialidplist div {
text-align: left;
}
.loginbox .loginform { .loginbox .loginform {
margin-top: 1em; margin-top: 1em;
text-align: left; text-align: left;
@ -558,7 +548,9 @@ a.skip:active {
margin-bottom: -2000px; margin-bottom: -2000px;
padding-bottom: 2000px; padding-bottom: 2000px;
} }
.loginbox .potentialidp {
margin-bottom: 0.3em;
}
.loginbox .potentialidp .smallicon { .loginbox .potentialidp .smallicon {
vertical-align: text-bottom; vertical-align: text-bottom;
margin: 0 .3em; margin: 0 .3em;

15
theme/bootstrapbase/style/moodle.css
View file

@ -2796,24 +2796,14 @@ a.skip:active {
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 15px; margin-top: 15px;
} }
.loginbox .signuppanel .subcontent {
text-align: left;
}
.loginbox .loginsub { .loginbox .loginsub {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
.loginbox .guestsub, .loginbox .guestsub,
.loginbox .forgotsub, .loginbox .forgotsub {
.loginbox .potentialidps {
margin: 5px 12%; margin: 5px 12%;
} }
.loginbox .potentialidps .potentialidplist {
margin-left: 40%;
}
.loginbox .potentialidps .potentialidplist div {
text-align: left;
}
.loginbox .loginform { .loginbox .loginform {
margin-top: 1em; margin-top: 1em;
text-align: left; text-align: left;
@ -2851,6 +2841,9 @@ a.skip:active {
margin-bottom: -2000px; margin-bottom: -2000px;
padding-bottom: 2000px; padding-bottom: 2000px;
} }
.loginbox .potentialidp {
margin-bottom: 0.3em;
}
.loginbox .potentialidp .smallicon { .loginbox .potentialidp .smallicon {
vertical-align: text-bottom; vertical-align: text-bottom;
margin: 0 .3em; margin: 0 .3em;