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

Jump to bottom

Upgrade font-awesome to 5+ #5822

Merged
merged 6 commits into from
Dec 3, 2019
Merged

Upgrade font-awesome to 5+ #5822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f884fdd
Upgrade font-awesome to 5+
jennifer-shehane Nov 29, 2019
78b8bec
fix failing spec
jennifer-shehane Nov 29, 2019
644c1e8
include all the necssary scss
chrisbreiding Dec 2, 2019
039feec
fix/improve tests
chrisbreiding Dec 2, 2019
2aa6768
fix icon references
chrisbreiding Dec 2, 2019
0896b30
fix some icons
chrisbreiding Dec 3, 2019
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
4 changes: 2 additions & 2 deletions packages/desktop-gui/cypress/integration/project_nav_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ describe('Project Nav', function () {

it('displays browser icon as spinner', () => {
cy.get('.browsers-list>a').first().find('i')
.should('have.class', 'fa fa-refresh fa-spin')
.should('have.class', 'fas fa-sync fa-spin')
})

it('disables browser dropdown', () => {
Expand All @@ -185,7 +185,7 @@ describe('Project Nav', function () {

it('displays browser icon as opened', () => {
cy.get('.browsers-list>a').first().find('i')
.should('have.class', 'fa fa-check-circle-o')
.should('have.class', 'fas fa-check-circle')
})

it('disables browser dropdown', () => {
Expand Down
12 changes: 6 additions & 6 deletions packages/desktop-gui/cypress/integration/specs_list_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ describe('Specs List', function () {
})

it('updates spec icon', function () {
cy.get('@allSpecs').find('i').should('have.class', 'fa-dot-circle-o')
cy.get('@allSpecs').find('i').should('have.class', 'fa-dot-circle')

cy.get('@allSpecs').find('i').should('not.have.class', 'fa-play')
})
Expand Down Expand Up @@ -424,8 +424,8 @@ describe('Specs List', function () {
})

it('updates spec icon', function () {
cy.get('@firstSpec').find('i').should('have.class', 'fa-dot-circle-o')
cy.get('@firstSpec').find('i').should('not.have.class', 'fa-file-code-o')
cy.get('@firstSpec').find('i').should('have.class', 'fa-dot-circle')
cy.get('@firstSpec').find('i').should('not.have.class', 'fa-file-code')
})

it('sets spec as active', () => {
Expand All @@ -439,7 +439,7 @@ describe('Specs List', function () {
})

it('updates spec icon', () => {
cy.get('@deepSpec').find('i').should('have.class', 'fa-dot-circle-o')
cy.get('@deepSpec').find('i').should('have.class', 'fa-dot-circle')
})

it('sets spec as active', () => {
Expand All @@ -461,8 +461,8 @@ describe('Specs List', function () {
})

it('updates spec icon', function () {
cy.get('@firstSpec').find('i').should('not.have.class', 'fa-dot-circle-o')
cy.get('@secondSpec').find('i').should('have.class', 'fa-dot-circle-o')
cy.get('@firstSpec').find('i').should('not.have.class', 'fa-dot-circle')
cy.get('@secondSpec').find('i').should('have.class', 'fa-dot-circle')
})

it('updates active spec', function () {
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"@cypress/icons": "0.7.0",
"@cypress/json-schemas": "5.33.0",
"@cypress/react-tooltip": "0.5.3",
"@fortawesome/fontawesome-free": "5.11.2",
"bin-up": "1.2.2",
"bluebird": "3.5.3",
"bootstrap-sass": "3.4.1",
"classnames": "2.2.6",
"cross-env": "5.2.1",
"fira": "cypress-io/fira#fb63362742eea8cdce0d90825ab9264d77719e3d",
"font-awesome": "4.7.0",
"gravatar": "1.8.0",
"human-interval": "0.1.6",
"lodash": "4.17.15",
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop-gui/src/app/global-error.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ const GlobalError = observer(() => {
return (
<div className='global-error alert alert-danger'>
<p>
<i className='fa fa-warning'></i>{' '}
<i className="fas fa-exclamation-triangle"></i>{' '}
<strong>{appStore.error.name || 'Unexpected Error'}</strong>
</p>
<p dangerouslySetInnerHTML={{
__html: appStore.error.message.split('\n').join('<br />'),
}} />
<button className='btn btn-link close' onClick={remove}>
<i className='fa fa-remove' />
<i className='fas fa-times' />
</button>
</div>
)
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop-gui/src/app/intro.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class Default extends Component {
onDrop={this._drop}
>
<span className="fa-stack fa-lg">
<i className="fa fa-folder fa-stack-2x"></i>
<i className="fa fa-plus fa-stack-1x"></i>
<i className="fas fa-folder fa-stack-2x"></i>
<i className="fas fa-plus fa-stack-1x"></i>
</span>
<p>Drag your project here or <a href="#" onClick={this._selectProject}>select manually</a>.</p>
</div>
Expand All @@ -51,7 +51,7 @@ class Default extends Component {
return (
<div className='local-install-notice alert alert-info alert-dismissible'>
<p className='text-center'>
<i className='fa fa-info-circle'></i>{' '}
<i className='fas fa-info-circle'></i>{' '}
We recommend versioning Cypress per project and{' '}
<a onClick={this._openHelp} className='helper-docs-link'>
installing it via <span className='mono'>npm</span>
Expand Down
3 changes: 1 addition & 2 deletions packages/desktop-gui/src/app/intro.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
line-height: 3em;
}

.fa {
// font-size: 50px;
.fas {
color: #d3d6d8;

&.fa-stack-2x {
Expand Down
12 changes: 6 additions & 6 deletions packages/desktop-gui/src/app/nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ export default class Nav extends Component {
<ul className='nav'>
<li>
<a onClick={this._openSupport} href='#'>
<i className='fa fa-question-circle'></i> Support
<i className='fas fa-question-circle'></i> Support
</a>
</li>
<li>
<a onClick={this._openDocs} href='#'>
<i className='fa fa-graduation-cap'></i> Docs
<i className='fas fa-graduation-cap'></i> Docs
</a>
</li>
{this._userStateButton()}
Expand All @@ -51,7 +51,7 @@ export default class Nav extends Component {
if (appStore.isGlobalMode && project) {
return (
<Link to={routes.intro()}>
<i className='fa fa-chevron-left'></i> Back
<i className='fas fa-chevron-left'></i> Back
</Link>
)
}
Expand All @@ -69,7 +69,7 @@ export default class Nav extends Component {
return (
<li>
<div>
<i className='fa fa-user' /> <i className='fa fa-spinner fa-spin' />
<i className='fas fa-user' /> <i className='fas fa-spinner fa-spin' />
</div>
</li>
)
Expand All @@ -79,7 +79,7 @@ export default class Nav extends Component {
return (
<li>
<a onClick={this._showLogin}>
<i className='fa fa-user' /> Log In
<i className='fas fa-user' /> Log In
</a>
</li>
)
Expand Down Expand Up @@ -114,7 +114,7 @@ export default class Nav extends Component {

return (
<span>
<i className='fa fa-sign-out'></i>{' '}
<i className='fas fa-sign-out-alt'></i>{' '}
Log Out
</span>
)
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop-gui/src/auth/login-form.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ class LoginForm extends Component {
if (message && message.name === 'AUTH_COULD_NOT_LAUNCH_BROWSER') {
return (
<span>
<i className='fa fa-exclamation-triangle'></i>{' '}
<i className='fas fa-exclamation-triangle'></i>{' '}
Could not open browser.
</span>
)
}

return (
<span>
<i className='fa fa-spinner fa-spin'></i>{' '}
<i className='fas fa-spinner fa-spin'></i>{' '}
{message && message.browserOpened ? 'Waiting for browser login...' : 'Opening browser...'}
</span>
)
Expand All @@ -90,7 +90,7 @@ class LoginForm extends Component {
return (
<div className='alert alert-danger'>
<p>
<i className='fa fa-warning'></i>{' '}
<i className='fas fa-exclamation-triangle'></i>{' '}
<strong>Can't Log In</strong>
</p>
<p>{this._errorMessage(error.message)}</p>
Expand Down
8 changes: 4 additions & 4 deletions packages/desktop-gui/src/auth/login-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class LoginContent extends Component {
return (
<div className='modal-body login'>
<BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
<h1><i className='fa fa-lock'></i> Log In</h1>
<h1><i className='fas fa-lock'></i> Log In</h1>
<p>Logging in gives you access to the <a onClick={this._openDashboard}>Cypress Dashboard Service</a>. You can set up projects to be recorded and see test data from your project.</p>
<LoginForm onSuccess={() => this.setState({ succeeded: true })} />
</div>
Expand All @@ -79,7 +79,7 @@ class LoginContent extends Component {
return (
<div className='modal-body login'>
<BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
<h1><i className='fa fa-check'></i> Login Successful</h1>
<h1><i className='fas fa-check'></i> Login Successful</h1>
<p>You are now logged in as {authStore.user.name}.</p>
<div className='login-content'>
<button
Expand All @@ -97,14 +97,14 @@ class LoginContent extends Component {
return (
<div className='modal-body login login-no-api-server'>
<BootstrapModal.Dismiss className='btn btn-link close'>x</BootstrapModal.Dismiss>
<h4><i className='fa fa-wifi'></i> Cannot connect to API server</h4>
<h4><i className='fas fa-wifi'></i> Cannot connect to API server</h4>
<p>Logging in requires connecting to an external API server. We tried but failed to connect to the API server at <em>{this.state.apiUrl}</em></p>
<p>
<button
className='btn btn-default btn-sm'
onClick={this._pingApiServer}
>
<i className='fa fa-refresh'></i>{' '}
<i className='fas fa-sync'></i>{' '}
Try again
</button>
</p>
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-gui/src/duration-timer/TimerDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default class TimerDisplay extends Component {
render () {
return (
<span className='env-duration'>
<i className='fa fa-hourglass-half'></i>
<i className='fas fa-hourglass-half'></i>
{this.timerStore.mainDisplay}
</span>
)
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-gui/src/lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const getStatusIcon = (status) => {
case 'passed':
return 'check-circle'
case 'running':
return 'refresh fa-spin'
return 'sync fa-spin'
case 'overLimit':
return 'exclamation-triangle'
case 'timedOut':
Expand Down
14 changes: 7 additions & 7 deletions packages/desktop-gui/src/project-nav/browsers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default class Browsers extends Component {
return (
<li className='close-browser'>
<button className='btn btn-xs btn-danger' onClick={this._closeBrowser.bind(this)}>
<i className='fa fa-fw fa-times'></i>
<i className='fas fa-fw fa-times'></i>
Stop
</button>
</li>
Expand All @@ -58,19 +58,19 @@ export default class Browsers extends Component {
let prefixText

if (project.browserState === 'opening') {
icon = 'refresh fa-spin'
icon = 'fas fa-sync fa-spin'
prefixText = 'Opening'
} else if (project.browserState === 'opened') {
icon = 'check-circle-o green'
icon = 'fas fa-check-circle green far'
prefixText = 'Running'
} else {
icon = browser.icon
icon = `fab fa-${browser.icon}`
prefixText = ''
}

return (
<span className={browser.name}>
<i className={`fa fa-${icon}`}></i>{' '}
<i className={icon}></i>{' '}
{prefixText}{' '}
{browser.displayName}{' '}
{browser.majorVersion}
Expand All @@ -90,7 +90,7 @@ export default class Browsers extends Component {
placement='bottom'
className='browser-info-tooltip cy-tooltip'
>
<i className='fa fa-exclamation-triangle' />
<i className='fas fa-exclamation-triangle' />
</Tooltip>
</span>
)
Expand All @@ -106,7 +106,7 @@ export default class Browsers extends Component {
placement='bottom'
className='browser-info-tooltip cy-tooltip'
>
<i className='fa fa-info-circle' />
<i className='fas fa-info-circle' />
</Tooltip>
</span>
)
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop-gui/src/project-nav/project-nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ export default class ProjectNav extends Component {
<ul className='nav'>
<li>
<Link to={routes.specs(project)}>
<i className='fa fa-code'></i>{' '}
<i className='fas fa-code'></i>{' '}
Tests
</Link>
</li>
<li>
<Link to={routes.runs(project)}>
<i className='fa fa-database'></i>{' '}
<i className='fas fa-database'></i>{' '}
Runs
</Link>
</li>
<li>
<Link to={routes.settings(project)}>
<i className='fa fa-cog'></i>{' '}
<i className='fas fa-cog'></i>{' '}
Settings
</Link>
</li>
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop-gui/src/project/error-message.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ErrorMessage extends Component {
<div className='full-alert-container'>
<div className='full-alert alert alert-danger error'>
<p className='header'>
<i className='fa fa-warning'></i>{' '}
<i className='fas fa-exclamation-triangle'></i>{' '}
<strong>{err.title || 'Can\'t start server'}</strong>
</p>
<span className='alert-content'>
Expand All @@ -81,7 +81,7 @@ class ErrorMessage extends Component {
className='btn btn-default btn-sm'
onClick={this.props.onTryAgain}
>
<i className='fa fa-refresh'></i>{' '}
<i className='fas fa-sync'></i>{' '}
Try Again
</button>
</div>
Expand Down
12 changes: 6 additions & 6 deletions packages/desktop-gui/src/project/onboarding.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,26 @@ class OnBoarding extends Component {
<p>
We've added some folders and example tests to your project. Try running the tests in the
<strong onClick={this._openExampleSpec}>
<i className='fa fa-folder-o'></i>{' '}
<i className='far fa-folder'></i>{' '}
{project.integrationExampleName}{' '}
</strong>
folder or add your own test files to
<strong onClick={this._openIntegrationFolder}>
<i className='fa fa-folder-o'></i>{' '}
<i className='far fa-folder'></i>{' '}
cypress/integration
</strong>.
</p>
<div className='folder-preview-onboarding'>
<ul>
<li>
<span>
<i className='fa fa-folder-open-o'></i>{' '}
<i className='far fa-folder-open'></i>{' '}
{project.name}
</span>
<ul>
<li className='app-code'>
<span >
<i className='fa fa-folder-o'></i>{' '}
<i className='far fa-folder'></i>{' '}
...
</span>
</li>
Expand Down Expand Up @@ -98,7 +98,7 @@ class OnBoarding extends Component {
return (
<li className={cs(className, 'new-item')} key={file.name}>
<span>
<i className='fa fa-folder-open-o'></i>{' '}
<i className='far fa-folder-open'></i>{' '}
{file.name}
</span>
<ul>
Expand All @@ -111,7 +111,7 @@ class OnBoarding extends Component {
return (
<li className={cs(className, 'new-item', { 'is-more': file.more })} key={file.name}>
<span>
<i className='fa fa-file-code-o'></i>{' '}
<i className='far fa-file-code'></i>{' '}
{file.name}
</span>
</li>
Expand Down
Loading