Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Fix padding in all screens" #1550

Merged
merged 5 commits into from
Nov 13, 2018
+51 −20
Merged

Revert "Fix padding in all screens" #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
476a4da
Revert "Trim auth params before sending to the API (not while typing)…
luisrudge Nov 13, 2018
7ffca12
Revert "updated lock-cred-pane (#1549)"
luisrudge Nov 13, 2018
89e28ce
Revert "Update AUth0.js (#1548)"
luisrudge Nov 13, 2018
c26181f
Revert "Fix padding in all screens (#1547)"
luisrudge Nov 13, 2018
3a41fa5
Merge branch 'master' into revert-1547-fix/quick-auth-screen-padding
luisrudge Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion css/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ loadingSize = 30px
-webkit-box-sizing border-box
-moz-box-sizing border-box
box-sizing border-box
padding 20px

.auth0-lock-form
display initial
Expand Down Expand Up @@ -1100,6 +1099,8 @@ loadingSize = 30px
// database mode

.auth0-lock.auth0-lock
.auth0-lock-internal-content-wrapper
padding 20px
.auth0-lock-tabs
background white
padding 0
Expand Down
32 changes: 24 additions & 8 deletions src/__tests__/engine/classic/__snapshots__/login.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ exports[`LoginScreen renders LoginPane when SSO is enabled 1`] = `
>
ssoEnabled
</div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="login_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand All @@ -32,7 +34,9 @@ exports[`LoginScreen renders LoginPane when SSO is enabled 1`] = `

exports[`LoginScreen renders LoginPane when has database connection 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="login_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand All @@ -57,7 +61,9 @@ exports[`LoginScreen renders LoginPane when has database connection 1`] = `

exports[`LoginScreen renders LoginPane when has enterprise connection 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="login_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand Down Expand Up @@ -89,7 +95,9 @@ exports[`LoginScreen renders LoginSignUpTabs when database connection is enabled
data-signUpLabel="signUpLabel"
data-signUpLink={false}
/>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="login_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand All @@ -114,7 +122,9 @@ exports[`LoginScreen renders LoginSignUpTabs when database connection is enabled

exports[`LoginScreen renders LoginSignUpTabs when social connection is enabled and has initial screen signUp and has screen signUp 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="login_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand Down Expand Up @@ -144,7 +154,9 @@ exports[`LoginScreen renders SingleSignOnNotice when SSO is enabled 1`] = `
>
ssoEnabled
</div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="login_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand All @@ -169,7 +181,9 @@ exports[`LoginScreen renders SingleSignOnNotice when SSO is enabled 1`] = `

exports[`LoginScreen renders SocialButtonsPane when has social connections 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="social_buttons_pane"
data-bigButtons={false}
Expand All @@ -185,6 +199,8 @@ exports[`LoginScreen renders SocialButtonsPane when has social connections 1`] =

exports[`LoginScreen renders empty div by default 1`] = `
<div>
<div />
<div
className="auth0-lock-internal-content-wrapper"
/>
</div>
`;
28 changes: 21 additions & 7 deletions src/__tests__/engine/classic/__snapshots__/sign_up_screen.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

exports[`SignUpScreen disables SocialButtonsPane when terms were not accepted 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="social_buttons_pane"
data-bigButtons={false}
Expand All @@ -24,13 +26,17 @@ exports[`SignUpScreen renders LoginSignUpTabs SSO is disabled and has screen log
data-loginLabel="loginLabel"
data-signUpLabel="signUpLabel"
/>
<div />
<div
className="auth0-lock-internal-content-wrapper"
/>
</div>
`;

exports[`SignUpScreen renders SignUpPane when has database connection 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="sign_up_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand All @@ -54,7 +60,9 @@ exports[`SignUpScreen renders SignUpPane when has database connection 1`] = `

exports[`SignUpScreen renders SignUpPane when has enterprise connection 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="sign_up_pane"
data-emailInputPlaceholder="emailInputPlaceholder"
Expand Down Expand Up @@ -83,13 +91,17 @@ exports[`SignUpScreen renders SingleSignOnNotice when SSO is enabled and has scr
>
ssoEnabled
</div>
<div />
<div
className="auth0-lock-internal-content-wrapper"
/>
</div>
`;

exports[`SignUpScreen renders SocialButtonsPane when has social connections 1`] = `
<div>
<div>
<div
className="auth0-lock-internal-content-wrapper"
>
<div
data-__type="social_buttons_pane"
data-bigButtons={false}
Expand All @@ -105,6 +117,8 @@ exports[`SignUpScreen renders SocialButtonsPane when has social connections 1`]

exports[`SignUpScreen renders empty div by default 1`] = `
<div>
<div />
<div
className="auth0-lock-internal-content-wrapper"
/>
</div>
`;
2 changes: 1 addition & 1 deletion src/engine/classic/login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const Component = ({ i18n, model }) => {
<div>
{ssoNotice}
{tabs}
<div>
<div className="auth0-lock-internal-content-wrapper">
{social}
{separator}
{login}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/classic/sign_up_screen.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const Component = ({ i18n, model }) => {
<div>
{ssoNotice}
{tabs}
<div>
<div className="auth0-lock-internal-content-wrapper">
{social}
{separator}
{db}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/passwordless/social_or_email_login_screen.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const Component = ({ i18n, model }) => {
const separator = social && email ? <PaneSeparator /> : null;

return (
<div>
<div className="auth0-lock-internal-content-wrapper">
{social}
{separator}
{header}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/passwordless/social_or_phone_number_login_screen.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Component = ({ i18n, model }) => {
const separator = social && phoneNumber ? <PaneSeparator /> : null;

return (
<div>
<div className="auth0-lock-internal-content-wrapper">
{social}
{separator}
{phoneNumber}
Expand Down