scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2739 from chrisgarrity/issue/2309-wide-translations

Browse source 
Wrap ‘need help?’ link when translation is too long
This commit is contained in:
Benjamin Wheeler 2019-02-05 09:43:15 -05:00 committed by GitHub
commit 16ca2d7319
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/components/login/login.jsx
View file

@ -7,6 +7,7 @@ const Form = require('../forms/form.jsx');
const Input = require('../forms/input.jsx'); const Input = require('../forms/input.jsx');
const Button = require('../forms/button.jsx'); const Button = require('../forms/button.jsx');
const Spinner = require('../spinner/spinner.jsx'); const Spinner = require('../spinner/spinner.jsx');
const FlexRow = require('../flex-row/flex-row.jsx');
require('./login.scss'); require('./login.scss');
@ -59,34 +60,35 @@ class Login extends React.Component {
name="password" name="password"
type="password" type="password"
/> />
{this.state.waiting ? [ <FlexRow className="submit-row">
<Button {this.state.waiting ? [
className="submit-button white" <Button
disabled="disabled" className="submit-button white"
key="submitButton" disabled="disabled"
type="submit" key="submitButton"
type="submit"
>
<Spinner
className="spinner"
color="blue"
/>
</Button>
] : [
<Button
className="submit-button white"
key="submitButton"
type="submit"
>
<FormattedMessage id="general.signIn" />
</Button>
]}
<a
href="/accounts/password_reset/"
key="passwordResetLink"
> >
<Spinner <FormattedMessage id="login.needHelp" />
className="spinner" </a>
color="blue" </FlexRow>
/>
</Button>
] : [
<Button
className="submit-button white"
key="submitButton"
type="submit"
>
<FormattedMessage id="general.signIn" />
</Button>
]}
<a
className="right"
href="/accounts/password_reset/"
key="passwordResetLink"
>
<FormattedMessage id="login.needHelp" />
</a>
{error} {error}
</Form> </Form>
</div> </div>

11
src/components/login/login.scss
View file

@ -28,22 +28,23 @@
font-weight: bold; font-weight: bold;
} }
.right {
float: right;
}
.spinner { .spinner {
margin: 0 .8rem; margin: 0 .8rem;
width: 1rem; width: 1rem;
vertical-align: middle; vertical-align: middle;
} }
.submit-row {
justify-content: space-between;
flex-direction: row; // override 'column' layout at small widths
}
.submit-button { .submit-button {
margin-top: 5px; margin-top: 5px;
} }
a { a {
margin-top: 15px; margin: auto 0;
color: $ui-white; color: $ui-white;
&:link, &:link,