File tree 6 files changed +8
-53
lines changed
my-sites/invites/invite-accept-logged-out 6 files changed +8
-53
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ interface SignupSubmitButtonProps {
8
8
variationName ?: string ;
9
9
children : ReactNode ;
10
10
className ?: string ;
11
+ onClick ?: ( ) => void ;
11
12
}
12
13
13
14
const SignupSubmitButton = ( {
@@ -16,6 +17,7 @@ const SignupSubmitButton = ( {
16
17
variationName,
17
18
children,
18
19
className,
20
+ onClick,
19
21
} : SignupSubmitButtonProps ) => {
20
22
return (
21
23
< Button
@@ -28,6 +30,7 @@ const SignupSubmitButton = ( {
28
30
) }
29
31
disabled = { isDisabled }
30
32
isBusy = { isBusy }
33
+ onClick = { onClick }
31
34
__next40pxDefaultSize
32
35
>
33
36
{ children }
Original file line number Diff line number Diff line change @@ -1037,11 +1037,6 @@ $colophon-height: 50px;
1037
1037
color : var (--color-neutral-80 );
1038
1038
}
1039
1039
1040
- .signup-form__submit {
1041
- border : 0 ;
1042
- box-shadow : none ;
1043
- }
1044
-
1045
1040
.jetpack-header__partner-logo-plus svg {
1046
1041
stroke : var (--color-neutral-80 );
1047
1042
}
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ $image-height: 47px;
19
19
padding-bottom : $image-height ;
20
20
min-height : calc (100% - #{$image-height } );
21
21
}
22
-
22
+
23
23
.layout__content {
24
24
position : static ;
25
25
}
@@ -315,7 +315,6 @@ $image-height: 47px;
315
315
}
316
316
317
317
.login .button.is-primary {
318
- // Note: Matches primary button to `button.signup-form__submit`
319
318
background-color : var (--studio-wordpress-blue , #3858e9 );
320
319
color : var (--color-text-inverted );
321
320
box-shadow : none ;
@@ -363,7 +362,7 @@ $image-height: 47px;
363
362
// following overrides could be safely deleted.
364
363
input :not (.components-text-control__input ),
365
364
button :not (.components-button ) {
366
- /* Note: Same as `button.signup-form__submit, .signup-form__input.form-text-input` */
365
+ /* Note: Same as `.signup-form__input.form-text-input` */
367
366
height : 40px ; // Matches .components-button height __next40pxDefaultSize
368
367
border : 1px solid var (--studio-gray-10 );
369
368
font-size : $font-body ;
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import { Component } from 'react';
6
6
import { connect } from 'react-redux' ;
7
7
import store from 'store' ;
8
8
import SignupForm from 'calypso/blocks/signup-form' ;
9
- import FormButton from 'calypso/components/forms/ form-button' ;
9
+ import SignupSubmitButton from 'calypso/blocks/signup- form/signup-submit -button' ;
10
10
import LoggedOutFormLinkItem from 'calypso/components/logged-out-form/link-item' ;
11
11
import LoggedOutFormLinks from 'calypso/components/logged-out-form/links' ;
12
12
import { recordTracksEvent } from 'calypso/lib/analytics/tracks' ;
@@ -150,9 +150,9 @@ class InviteAcceptLoggedOut extends Component {
150
150
< div className = "logged-out-form" >
151
151
{ this . renderFormHeader ( ) }
152
152
< Card className = "logged-out-form__footer" >
153
- < FormButton className = "signup-form__submit" onClick = { this . clickSignInLink } >
153
+ < SignupSubmitButton onClick = { this . clickSignInLink } >
154
154
{ this . props . translate ( 'Sign In' ) }
155
- </ FormButton >
155
+ </ SignupSubmitButton >
156
156
</ Card >
157
157
</ div >
158
158
</ div >
Original file line number Diff line number Diff line change @@ -52,27 +52,6 @@ body.is-section-accept-invite {
52
52
max-width : 372px ;
53
53
background : none ;
54
54
55
- button .is-primary {
56
- border-radius : 2px ;
57
- border : 1px solid var (--studio-wordpress-blue , #3858e9 );
58
- background : var (--studio-wordpress-blue , #3858e9 );
59
- height : 48px ;
60
- font-weight : 500 ;
61
- & :hover {
62
- background : var (--studio-wordpress-blue-60 );
63
- }
64
- & :focus {
65
- background-color : var (--studio-wordpress-blue-60 );
66
- border-color : var (--studio-wordpress-blue-60 );
67
- color : var (--color-text-inverted );
68
- box-shadow : none ;
69
- }
70
- & :disabled {
71
- background : var (--studio-gray-20 );
72
- border : 1px solid var (--studio-gray-20 );
73
- color : var (--color-surface );
74
- }
75
- }
76
55
label .form-label {
77
56
color : var (--studio-gray-60 , #50575e );
78
57
font-size : 0.875rem ;
Original file line number Diff line number Diff line change @@ -307,27 +307,6 @@ body.is-section-signup .layout:not(.dops):not(.is-wccom-oauth-flow) {
307
307
308
308
.signup__step.is-user ,
309
309
.signup__step.is-user-social {
310
- .button.signup-form__submit [disabled ],
311
- .button.signup-form__submit :disabled ,
312
- .button.signup-form__submit.disabled {
313
- background-color : var (--studio-gray-20 );
314
- color : var (--color-surface );
315
- }
316
-
317
- .button.signup-form__submit {
318
- border-radius : 4px ;
319
- max-width : 408px ;
320
- height : 44px ;
321
- box-shadow : 0 1px 2px rgba (0 , 0 , 0 , 0.05 );
322
- font-weight : 500 ;
323
- letter-spacing : 0.32px ;
324
- line-height : 17px ;
325
-
326
- & .newsletter-signup-form {
327
- background-color : var (--color-primary );
328
- }
329
- }
330
-
331
310
.signup-form__terms-of-service-link {
332
311
text-align : start ;
333
312
font-size : 0.875rem ;
You can’t perform that action at this time.
0 commit comments