Skip to content

Commit

Permalink
Site migration: progress view adjustments (#38214)
Browse files Browse the repository at this point in the history
* Using new illustration without bubble. Wrapping domains in subheader with spans so they don't break. Sizing and aligning progress item icons.

* Removed translation calls.
  • Loading branch information
andfinally authored Dec 12, 2019
1 parent 88b418d commit 41e1729
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 11 deletions.
38 changes: 32 additions & 6 deletions client/my-sites/migrate/section-migrate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -262,19 +262,27 @@ class SectionMigrate extends Component {
const { sourceSite, targetSite } = this.props;
const sourceSiteDomain = get( sourceSite, 'domain' );
const targetSiteDomain = get( targetSite, 'domain' );
const subHeaderText = (
<>
{ "We're moving everything from " }
<span className="migrate__domain">{ sourceSiteDomain }</span>
{ ' to ' }
<span className="migrate__domain">{ targetSiteDomain }</span>.
</>
);

return (
<>
<Card className="migrate__pane">
<img
className="migrate__illustration"
src={ '/calypso/images/illustrations/waitTime.svg' }
src={ '/calypso/images/illustrations/waitTime-plain.svg' }
alt=""
/>
<FormattedHeader
className="migrate__section-header"
headerText="Migration in progress"
subHeaderText={ `We're moving everything from ${ sourceSiteDomain } to ${ targetSiteDomain }.` }
subHeaderText={ subHeaderText }
align="center"
/>
{ this.renderStartTime() }
Expand Down Expand Up @@ -316,7 +324,13 @@ class SectionMigrate extends Component {
return <Gridicon className="migrate__progress-item-icon-success" icon="checkmark-circle" />;
}

return <img alt="" src="/calypso/images/importer/circle-gray.svg" />;
return (
<img
alt=""
src="/calypso/images/importer/circle-gray.svg"
className="migrate__progress-item-icon-todo"
/>
);
}

renderProgressItem( progressState ) {
Expand All @@ -328,13 +342,25 @@ class SectionMigrate extends Component {
let progressItemText;
switch ( progressState ) {
case 'backing-up':
progressItemText = `Backed up from ${ sourceSiteDomain }`;
progressItemText = (
<span>
Backed up from <span className="migrate__domain">{ sourceSiteDomain }</span>
</span>
);
if ( migrationStatus === 'backing-up' ) {
progressItemText = `Backing up from ${ sourceSiteDomain }`;
progressItemText = (
<span>
Backing up from <span className="migrate__domain">{ sourceSiteDomain }</span>
</span>
);
}
break;
case 'restoring':
progressItemText = `Restoring to ${ targetSiteDomain }`;
progressItemText = (
<span>
Restoring to <span className="migrate__domain">{ targetSiteDomain }</span>
</span>
);
break;
}

Expand Down
21 changes: 16 additions & 5 deletions client/my-sites/migrate/section-migrate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
}
}

.migrate__domain {
white-space: nowrap;
}

.migrate__progress {
max-width: 350px;
margin-bottom: 2rem;
Expand All @@ -123,19 +127,26 @@
}

.migrate__progress-item-icon {
display: flex;
width: 24px;
margin-right: 6px;
display: flex;

.spinner {
margin-left: 1px;
}
justify-content: center;
}

.migrate__progress-item-icon-success {
width: 22px;
color: var( --color-success );
}

.migrate__progress-item-icon-todo {
width: 20px;
}

.migrate__progress-item-icon-spinner {
width: 20px;
height: 20px;
}

.migrate__progress-item-text {
display: flex;
}
107 changes: 107 additions & 0 deletions static/images/illustrations/waitTime-plain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 41e1729

Please sign in to comment.