Merge pull request #67 from edx/fix-css-styles

fix spacing issues on login and register page
This commit is contained in:
Uzair Rasheed
2021-01-07 16:50:21 +05:00
committed by GitHub
8 changed files with 22 additions and 21 deletions

View File

@@ -10,7 +10,7 @@ export const RenderInstitutionButton = props => {
if (secondaryProviders !== undefined && secondaryProviders.length > 0) {
return (
<Button
className="mb-2"
className="mb-2 mt-2"
block
variant="outline-primary"
onClick={onSubmitHandler}
@@ -55,7 +55,7 @@ const InstitutionLogistration = props => {
<h4>or</h4>
</div>
<Button
variant="outline-primary"
variant="primary"
onClick={onSubmitHandler}
>
{buttonTitle}

View File

@@ -170,7 +170,7 @@ class LoginPage extends React.Component {
secondaryProviders={thirdPartyAuthContext.secondaryProviders}
buttonTitle={intl.formatMessage(messages['logistration.login.institution.login.button'])}
/>
<div className="mb-4">
<div className="mb-4 mt-3">
<h4>{intl.formatMessage(messages['logistration.or.sign.in.with'])}</h4>
</div>
</>
@@ -218,7 +218,7 @@ class LoginPage extends React.Component {
</Hyperlink>
<StatefulButton
type="submit"
className="btn-primary submit"
className="btn-primary"
state={submitState}
labels={{
default: intl.formatMessage(messages['logistration.sign.in.button']),

View File

@@ -466,7 +466,7 @@ class RegistrationPage extends React.Component {
<h4 className="d-block mx-auto mb-4">
{intl.formatMessage(messages['logistration.create.an.account.using'])}
</h4>
<div className="row tpa-container">
<div className="row tpa-container mb-3">
<SocialAuthProviders socialAuthProviders={providers} referrer={REGISTER_PAGE} />
</div>
<RenderInstitutionButton
@@ -579,7 +579,7 @@ class RegistrationPage extends React.Component {
{ this.state.enableOptionalField ? this.addExtraOptionalFields() : null}
<StatefulButton
type="button"
className="btn-primary submit mt-4"
className="btn-primary"
state={submitState}
labels={{
default: intl.formatMessage(messages['logistration.create.account.button']),

View File

@@ -7,7 +7,7 @@ const messages = defineMessages({
description: 'Button label that appears on login page',
},
'logistration.create.account.button': {
id: 'ogistration.create.account.button',
id: 'logistration.create.account.button',
defaultMessage: 'Create Account',
description: 'Button label that appears on register page',
},

View File

@@ -127,7 +127,8 @@ describe('LoginPage', () => {
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
loginPage.find('input#loginPassword').simulate('change', { target: { value: 'test', name: 'password' } });
loginPage.find('button.submit').simulate('click');
loginPage.find('button.btn-primary').simulate('click');
expect(loginPage.find('LoginPage').state('errors')).toEqual(errorState);
});
@@ -136,7 +137,7 @@ describe('LoginPage', () => {
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
loginPage.find('input#loginEmail').simulate('change', { target: { value: 'test@example.com', name: 'email' } });
loginPage.find('button.submit').simulate('click');
loginPage.find('button.btn-primary').simulate('click');
expect(loginPage.find('LoginPage').state('errors')).toEqual(errorState);
});

View File

@@ -219,7 +219,7 @@ describe('./RegistrationPage.js', () => {
store.dispatch = jest.fn(store.dispatch);
const registrationPage = mount(reduxWrapper(<IntlRegistrationPage {...props} />));
registrationPage.find('button.submit').simulate('click');
registrationPage.find('button.btn-primary').simulate('click');
expect(store.dispatch).not.toHaveBeenCalledWith(registerNewUser(formPayload));
});

View File

@@ -141,7 +141,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="submit"
@@ -333,7 +333,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="submit"
@@ -491,7 +491,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="submit"
@@ -649,7 +649,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
<button
aria-disabled={true}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary submit disabled btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary disabled btn btn-primary"
disabled={false}
onClick={[Function]}
type="submit"
@@ -833,7 +833,7 @@ exports[`LoginPage should show error message 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="submit"

View File

@@ -155,7 +155,7 @@ exports[`./RegistrationPage.js should display no password field when current pro
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@@ -203,7 +203,7 @@ exports[`./RegistrationPage.js should match TPA provider snapshot 1`] = `
Create an account using
</h4>
<div
className="row tpa-container"
className="row tpa-container mb-3"
>
<button
className="btn-social btn-oa2-apple-id"
@@ -380,7 +380,7 @@ exports[`./RegistrationPage.js should match TPA provider snapshot 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@@ -565,7 +565,7 @@ exports[`./RegistrationPage.js should match default section snapshot 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@@ -750,7 +750,7 @@ exports[`./RegistrationPage.js should match pending button state snapshot 1`] =
<button
aria-disabled={true}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary submit mt-4 disabled btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary disabled btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
@@ -970,7 +970,7 @@ exports[`./RegistrationPage.js should show error message on 409 1`] = `
<button
aria-disabled={false}
aria-live="assertive"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"