yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-16 18:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5127 from strapi/front/auth-forms

Browse Source 
Auth forms UI
This commit is contained in:
cyril lopez 2020-01-29 17:33:22 +01:00 committed by GitHub
commit 2f72e9071e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/strapi-admin/admin/src/containers/AuthPage/Wrapper.js
View File

@ -57,18 +57,27 @@ const Wrapper = styled.div`
box-shadow: 0 2px 4px 0 #e3e9f3;
}
.form-check-label {
input[type='checkbox'] + p {
line-height: 1.8rem;
margin-bottom: 0;
}
}
.loginButton {
margin-top: -6px;
margin-bottom: 31px;
padding-right: 0;
text-align: right;
> button {
margin-right: 1.6rem;
min-width: 14rem;
}
}
.buttonContainer {
padding-top: 1rem;
padding-top: 1.1rem;
}
.linkContainer {

15
packages/strapi-admin/admin/src/containers/AuthPage/index.js
View File

@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
import { get, isEmpty, omit, set, upperFirst } from 'lodash';
import { FormattedMessage } from 'react-intl';
import { Link, Redirect } from 'react-router-dom';
import { Button } from '@buffetjs/core';
import {
auth,
Button,
getQueryParameters,
getYupInnerErrors,
request,
@ -223,14 +223,17 @@ const AuthPage = ({
}`}
>
<Button
color="primary"
className={submitSuccess ? 'buttonForgotSuccess' : ''}
type="submit"
label={`Auth.form.button.${
submitSuccess ? 'forgot-password.success' : authType
}`}
primary={!submitSuccess}
style={authType === 'login' ? {} : { width: '100%' }}
/>
>
<FormattedMessage
id={`Auth.form.button.${
submitSuccess ? 'forgot-password.success' : authType
}`}
/>
</Button>
</div>
</div>
</div>

18
yarn.lock
View File

@ -12256,22 +12256,6 @@ node-notifier@^5.4.2:
shellwords "^0.1.1"
which "^1.3.0"
node-pre-gyp@*:
version "0.14.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
dependencies:
detect-libc "^1.0.2"
mkdirp "^0.5.1"
needle "^2.2.1"
nopt "^4.0.1"
npm-packlist "^1.1.6"
npmlog "^4.0.2"
rc "^1.2.7"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^4.4.2"
node-pre-gyp@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
@ -16975,7 +16959,7 @@ tar-stream@^2.1.0:
inherits "^2.0.3"
readable-stream "^3.1.1"
tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8:
tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
version "4.4.13"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==