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

Remove/account creation links #8973

Merged
merged 6 commits into from
Mar 16, 2018
Merged

Remove/account creation links #8973

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31e135f
Remove account creation link from the connection prompts
johnHackworth Mar 5, 2018
0bd262a
Fix lint error by removing unused variable
gravityrail Mar 5, 2018
6084ee5
Move ToS above the Setup Jetpack button in connection prompts.
AnnaMag Mar 6, 2018
3ca7043
Adjust wording in ToS and adapt styling in the Connect prompts.
AnnaMag Mar 6, 2018
5f8fb15
Merge branch 'master' into remove/account-creation-links
gravityrail Mar 7, 2018
86d7515
Fix failing component test
gravityrail Mar 7, 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
6 changes: 3 additions & 3 deletions _inc/client/components/connect-button/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,10 @@ export class ConnectButton extends React.Component {
render() {
return (
<div>
{ this.renderContent() }
{ this.props.children }
{ ! this.props.isSiteConnected &&
<p className="jp-banner__tos-blurb">
{ __(
'By connecting your site you agree to our fascinating {{tosLink}}Terms of Service{{/tosLink}} and to {{shareDetailsLink}}share details{{/shareDetailsLink}} with WordPress.com',
'By connecting your site you agree to our {{tosLink}}Terms of Service{{/tosLink}} and to {{shareDetailsLink}}share details{{/shareDetailsLink}} with WordPress.com',
{
components: {
tosLink: <a href="https://wordpress.com/tos" rel="noopener noreferrer" target="_blank" />,
Expand All @@ -149,6 +147,8 @@ export class ConnectButton extends React.Component {
) }
</p>
}
{ this.renderContent() }
{ this.props.children }
<JetpackDisconnectDialog
show={ this.state.showModal }
toggleModal={ this.toggleVisibility }
Expand Down
2 changes: 1 addition & 1 deletion _inc/client/components/connect-button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
border-color: $green-dark;
color: $white;
}
}
}
18 changes: 2 additions & 16 deletions _inc/client/components/jetpack-connect/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ class JetpackConnect extends React.Component {
static displayName = 'JetpackConnect';

render() {
const newAccountUrl = this.props.connectUrl + '&from=new-account-button';

return (
<div className="jp-jetpack-connect__container">
<h1 className="jp-jetpack-connect__container-title" title="Welcome to Jetpack">
Expand All @@ -29,13 +27,7 @@ class JetpackConnect extends React.Component {
<p className="jp-jetpack-connect__description">
{ __( 'Hassle-free design, marketing, and security for your WordPress site. Connect Jetpack to a WordPress.com account to start building your own success story.' ) }
</p>
<ConnectButton from="landing-page-top">
<p>
<a href={ newAccountUrl } className="jp-jetpack-connect__link">
{ __( 'No account? Create one for free.' ) }
</a>
</p>
</ConnectButton>
<ConnectButton from="landing-page-top"></ConnectButton>
</Card>

<Card className="jp-jetpack-connect__feature jp-jetpack-connect__design">
Expand Down Expand Up @@ -217,13 +209,7 @@ class JetpackConnect extends React.Component {
'We\'re passionate about WordPress and here to make your life easier.'
) }
</p>
<ConnectButton from="landing-page-bottom">
<p>
<a href={ newAccountUrl } className="jp-jetpack-connect__link">
{ __( 'No account? Create one for free.' ) }
</a>
</p>
</ConnectButton>
<ConnectButton from="landing-page-bottom"></ConnectButton>
</Card>
</div>
);
Expand Down
4 changes: 3 additions & 1 deletion _inc/client/components/jetpack-connect/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
.jp-banner__tos-blurb {
font-size: rem( 11px );
color: $gray-dark;
margin-bottom: 0;
padding-top: 5px;
margin-bottom: 30px;
}
}

Expand All @@ -24,6 +24,8 @@
}
.jp-jetpack-connect__description {
padding: 0 0 rem( 16px );
margin-top: 20px;
margin-bottom: 10px;
}
}

Expand Down