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

Add Jetpack connect screen loading screens and minor UI update #78665

Merged
merged 2 commits into from
Jun 29, 2023
Merged

Add Jetpack connect screen loading screens and minor UI update #78665

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d643f3
Add jetpack connection loading screens for woocommerce core profiler
chihsuan Jun 27, 2023
6991f92
Vertically center profile gravatar
chihsuan Jun 27, 2023
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
Prev Previous commit
Vertically center profile gravatar
  • Loading branch information
@chihsuan
chihsuan committed Jun 27, 2023
commit 6991f9298b616eed6686b2fe5503b02fc88ecbec
24 changes: 12 additions & 12 deletions client/jetpack-connect/authorize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,20 +848,20 @@ export class JetpackAuthorize extends Component {
<Fragment>
<div className="jetpack-connect__logged-in-content">
<Card className="jetpack-connect__logged-in-card">
<Gravatar user={ user } size={ 40 } />
<div>
<div className="jetpack-connect__logged-in-form-user">
<Gravatar user={ user } size={ 40 } />
<p className="jetpack-connect__logged-in-form-user-text">{ this.getUserText() }</p>
<LoggedOutFormLinkItem
href={ login( {
isJetpack: true,
redirectTo: window.location.href,
from: authQuery.from,
} ) }
onClick={ this.handleSignIn }
>
{ translate( 'Sign in as a different user' ) }
</LoggedOutFormLinkItem>
</div>
<LoggedOutFormLinkItem
href={ login( {
isJetpack: true,
redirectTo: window.location.href,
from: authQuery.from,
} ) }
onClick={ this.handleSignIn }
>
{ translate( 'Sign in as a different user' ) }
</LoggedOutFormLinkItem>
</Card>
<div className="jetpack-connect__logged-in-bottom">
{ this.renderStateAction() }
Expand Down
12 changes: 8 additions & 4 deletions client/jetpack-connect/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,10 +1130,8 @@ $colophon-height: 50px; // wpcomColophon element at the bottom

.jetpack-connect__logged-in-card {
display: flex;
flex-direction: row;
align-items: center;
flex-direction: column;
padding: 16px 24px;
gap: 16px;
background: #fff;
border: 1px solid $gray-400;
border-radius: 2px;
Expand All @@ -1144,6 +1142,12 @@ $colophon-height: 50px; // wpcomColophon element at the bottom
max-width: 100%;
}

.jetpack-connect__logged-in-form-user {
display: flex;
gap: 16px;
align-items: center;
}

.gravatar {
margin: 0;
}
Expand All @@ -1163,7 +1167,7 @@ $colophon-height: 50px; // wpcomColophon element at the bottom
}

.logged-out-form__link-item {
margin: 8px 0 0;
margin: 8px 0 0 56px;
padding: 0;
text-align: left;
text-decoration: none;
Expand Down