Skip to content

Commit

Permalink
chore: update file import status icons
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelramalho19 committed May 21, 2020
1 parent a233434 commit 493f0ab
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/files/file-import-status/FileImportStatus.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
.fileImportStatusCancel {
height: 3rem;
margin-left: 0.5rem;
margin-right: -1.2rem;
}

.fileImportStatusRow {
Expand All @@ -37,7 +38,7 @@
}

.fileImportStatusIcon {
width: 50px
width: 36px;
}

.fileLoadingIndicator {
Expand Down
10 changes: 5 additions & 5 deletions src/files/file-import-status/FileImportStatus.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import PropTypes from 'prop-types'
import { connect } from 'redux-bundler-react'
import { withTranslation } from 'react-i18next'
// Icons
import DocumentIcon from '../../icons/StrokeDocument'
import FolderIcon from '../../icons/StrokeFolder'
import DocumentIcon from '../../icons/GlyphDocGeneric'
import FolderIcon from '../../icons/GlyphFolder'
import './FileImportStatus.css'
import GlyphSmallArrows from '../../icons/GlyphSmallArrow'
import GlyphTick from '../../icons/GlyphTick'
Expand Down Expand Up @@ -35,13 +35,13 @@ const File = ({ paths = [], hasError }, t) => {

return pathsByFolder.map(({ count, name, path, size, progress }) => (
<li className="flex w-100 bb b--light-gray items-center f6 charcoal" key={ path || name }>
{ count ? <FolderIcon className='fileImportStatusIcon fill-aqua'/> : <DocumentIcon className='fileImportStatusIcon fill-aqua'/> }
{ count ? <FolderIcon className='fileImportStatusIcon fill-aqua pa1'/> : <DocumentIcon className='fileImportStatusIcon fill-aqua pa1'/> }
<span className="fileImportStatusName truncate">{ name || path }</span>
<span className='gray mh2'> |
{ count && (<span> { t('filesImportStatus.count', { count }) } | </span>) }
<span className='ml2'>{ filesize(size) }</span>
</span>
{ hasError ? <GlyphCancel className="dark-red w2" fill="currentColor"/> : <LoadingIndicator complete={ !progress }/> }
{ hasError ? <GlyphCancel className="dark-red w2 ph1" fill="currentColor"/> : <LoadingIndicator complete={ !progress }/> }
</li>
))
}
Expand All @@ -51,7 +51,7 @@ const LoadingIndicator = ({ complete }) => (
<div className={ classNames('fileLoadingIndicator bg-light-gray mh4 flex-auto relative', complete && 'dn') }>
<div className='fileLoadingIndicatorBar bg-blue absolute left-0'></div>
</div>
{ complete && <GlyphTick className="green w2" fill="currentColor"/>}
{ complete && <GlyphTick className="green w2 ph1" fill="currentColor"/>}
</>
)

Expand Down

0 comments on commit 493f0ab

Please sign in to comment.