Skip to content
This repository was archived by the owner on Jun 25, 2024. It is now read-only.

Commit d4865f2

Browse files
author
Billy Clark
committed
Incorporated PR feedback
1 parent cfb4fca commit d4865f2

File tree

3 files changed

+36
-19
lines changed

3 files changed

+36
-19
lines changed

dictionaries/login.definition.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"ko": "로그인"
3737
},
3838
"forgot": {
39-
"en": "Forgot your password? Reset it now",
40-
"es": "¿Olvidaste tu contraseña? Restablecer ahora",
41-
"fr": "Mot de passe oublié? Réinitialisez-le maintenant",
42-
"ko": "비밀번호를 잊어 버렸습니까? 지금 다시 설정하십시오"
39+
"en": "Forgot password?",
40+
"es": "¿Se te olvidó tu contraseña?",
41+
"fr": "Mot de passe oublié?",
42+
"ko": "비밀번호를 잊으 셨나요?"
4343
},
4444
"logo": {
4545
"en": "{idpName} logo",

themes/material/core/loginuserpass.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ function onRecaptchaLoad() {
4646
<?php include __DIR__ . '/../common-announcement.php' ?>
4747

4848
<div class="mdl-card mdl-shadow--8dp">
49-
<div class="mdl-card__media white-bg margin">
50-
49+
<div class="mdl-card__media white-bg margin" layout-children="column">
50+
<!-- TODO: update to /logo.png-->
5151
<img src="https://static.gtis.guru/idp-logo/sil-logo.png"
5252
alt="<?= $this->t('{material:login:logo}', ['{idpName}' => $idpName]) ?>">
5353
</div>
5454

5555

56-
<div class="mdl-card__title">
56+
<div class="mdl-card__title center">
5757
<h1 class="mdl-card__title-text">
5858
<?= $this->t('{material:login:header}', ['{idpName}' => $idpName]) ?>
5959
</h1>
@@ -100,19 +100,21 @@ function onRecaptchaLoad() {
100100

101101
<div class="mdl-card__actions" layout-children="row">
102102
<?php
103+
$forgotPasswordUrl = "asfsgf";
103104
if (! empty($forgotPasswordUrl)) {
104-
?>
105-
<a href="<?= htmlentities($forgotPasswordUrl) ?>" target="_blank"
106-
class="mdl-typography--caption margin">
107-
<?= $this->t('{material:login:forgot}') ?>
108-
</a>
109-
<?php
105+
?>
106+
<a href="<?= htmlentities($forgotPasswordUrl) ?>" target="_blank"
107+
class="mdl-button mdl-button--colored mdl-typography--caption">
108+
<?= $this->t('{material:login:forgot}') ?>
109+
</a>
110+
<?php
110111
}
111112
?>
112-
113+
<!--TODO: look at filling viewport on phones.-->
113114
<span flex></span>
114115

115-
<button class="mdl-button mdl-button--colored" form="loginform">
116+
<button type="submit" form="loginform"
117+
class="mdl-button mdl-button--colored mdl-button--raised">
116118
<?= $this->t('{material:login:button_login}') ?>
117119
</button>
118120
</div>

www/styles.2.1.0.css

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ form p.error {
108108
border-radius: 0.33em;
109109
padding: 1em;
110110

111-
/*
112-
had to center manually instead of using flex due to ie11 bug that
111+
/* had to center manually instead of using flex due to ie11 bug that
113112
was causing idp cards not to wrap when parent container was centered
114113
*/
115114
margin-left: auto;
@@ -123,12 +122,28 @@ form p.error {
123122
/* The font-size in the mdl-textfield was overriding the one in
124123
caption since it was defined later in the CSS but the font-size from
125124
caption is what was needed here so more specificity required to override
126-
it back
127-
*/
125+
it back */
128126
.mdl-textfield.mdl-typography--caption {
129127
font-size: 12px
130128
}
131129

130+
/* special case where we want a button for all it's built-in characteristics, e.g., primary color,
131+
but also want to set the text apart a bit. */
132+
.mdl-button.mdl-typography--caption {
133+
text-transform: none;
134+
font-size: 12px
135+
}
136+
137+
/* didn't feel like the padding was enough out of the box */
138+
.mdl-card__actions {
139+
padding: 1em;
140+
}
141+
142+
/* needed ability to center text in these card titles at times */
143+
.mdl-card__title.center {
144+
justify-content: center;
145+
}
146+
132147
[flex] {
133148
flex: 1;
134149
}

0 commit comments

Comments
 (0)