mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-07-05 09:42:41 +02:00
commit a590ff736c
4 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/login/block_login.php
View File

@ -115,7 +115,7 @@ class block_login extends block_base {
$this->content->text .= '<div class="potentialidplist">';
foreach ($potentialidps as $idp) {
$this->content->text .= '<div class="potentialidp">';
$this->content->text .= '<a class="btn btn-secondary btn-block" ';
$this->content->text .= '<a class="btn btn-default btn-block" ';
$this->content->text .= 'href="' . $idp['url']->out() . '" title="' . s($idp['name']) . '">';
if (!empty($idp['iconurl'])) {
$this->content->text .= '<img src="' . s($idp['iconurl']) . '" width="24" height="24" class="m-r-1"/>';

38
lib/templates/loginform.mustache
View File

@ -123,21 +123,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}}
@ -147,17 +146,18 @@
<div class="potentialidplist">
{{#identityproviders}}
<div class="potentialidp">
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}}>
{{#iconurl}}
<img src="{{iconurl}}" alt="" width="24" height="24"/>
{{/iconurl}}
{{name}}
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn">
{{#iconurl}}
<img src="{{iconurl}}" alt="" width="24" height="24"/>
{{/iconurl}}
{{name}}
</a>
</div>
{{/identityproviders}}
</div>
</div>
{{/hasidentityproviders}}
</div>
</div>
{{#js}}

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

@ -505,24 +505,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;
@ -558,7 +548,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;

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

@ -2796,24 +2796,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;
@ -2851,6 +2841,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;