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

Editor: display email verification notice in the header area. #12107

Merged
merged 3 commits into from
Mar 14, 2017
Merged

Editor: display email verification notice in the header area. #12107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66bb861
Editor: display email verification notice in the header area.
mtias Mar 14, 2017
12b0d24
Email verification notice: try floating popup.
jasmussen Mar 14, 2017
59b95a7
Fix spaces to tabs.
jasmussen Mar 14, 2017
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
25 changes: 12 additions & 13 deletions client/post-editor/editor-ground-control/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,18 @@ export default React.createClass( {
homeLink={ true }
externalLink={ true }
/>
{ this.state.needsVerification &&
<div className="editor-ground-control__email-verification-notice"
tabIndex={ 7 }
onClick={ this.props.onMoreInfoAboutEmailVerify }>
<Gridicon
icon="info"
className="editor-ground-control__email-verification-notice-icon" />
{ this.getVerificationNoticeLabel() }
{ ' ' }
<span className="editor-ground-control__email-verification-notice-more">{ this.translate( 'Learn More' ) }</span>
</div>
}
<div className="editor-ground-control__status">
{ this.isSaveEnabled() &&
<button
Expand Down Expand Up @@ -379,19 +391,6 @@ export default React.createClass( {
this.schedulePostPopover()
}
</div>
{
this.state.needsVerification &&
<div className="editor-ground-control__email-verification-notice"
tabIndex={ 7 }
onClick={ this.props.onMoreInfoAboutEmailVerify }>
<Gridicon
icon="info"
className="editor-ground-control__email-verification-notice-icon" />
{ this.getVerificationNoticeLabel() }
{ ' ' }
<span className="editor-ground-control__email-verification-notice-more">{ this.translate( 'Learn More' ) }</span>
</div>
}
</Card>
);
}
Expand Down
28 changes: 14 additions & 14 deletions client/post-editor/editor-ground-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,22 @@
display: none;
}

font-size: 12px;
padding: 16px 16px 16px 48px;
font-size: 13px;
padding: 8px 8px 8px 40px;
background: white;
margin: 16px -16px -16px;
position: relative;
color: $blue-wordpress;
border-top: 1px solid lighten( $gray, 20% );
border: 1px solid lighten( $gray, 20% );
cursor: pointer;
fill: $blue-wordpress;
position: absolute;
z-index: 1;
right: 4px;
top: 40px;
border-radius: 2px;
box-shadow: 0 1px 4px rgba($gray-dark, 0.2);;
max-width: 264px;
box-sizing: border-box;

&::before {
content: '';
Expand All @@ -177,24 +184,17 @@
background: white;
position: absolute;
top: -6px;
left: 50%;
right: 48px;
transform: translate(-50%) rotate(45deg);
border-top: 1px solid lighten( $gray, 20% );
border-left: 1px solid lighten( $gray, 20% );
}

&:focus:not(:active)::before {
box-shadow: -1px -1px 0 1px $blue-light;
border-top-color: $gray;
border-left-color: $gray;
}

&:focus:not(:active) {
box-shadow: 0 0 0 2px $blue-light;
z-index: 1;
border-top-color: $gray;
border-bottom: 1px solid $gray;
margin-bottom: -17px;
}

&:hover {
Expand All @@ -205,8 +205,8 @@

.editor-ground-control__email-verification-notice-icon {
position: absolute;
left: 16px;
top: 16px;
left: 8px;
top: 11px;
}

.editor-ground-control__email-verification-notice-more {
Expand Down