- pencil => pencil-alt - sliders => sliders-h related: #8484 #8776master
@@ -126,7 +126,7 @@ class ColumnHeader extends React.PureComponent { | |||||
} | } | ||||
if (children || multiColumn) { | if (children || multiColumn) { | ||||
collapseButton = <button className={collapsibleButtonClassName} title={formatMessage(collapsed ? messages.show : messages.hide)} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>; | |||||
collapseButton = <button className={collapsibleButtonClassName} title={formatMessage(collapsed ? messages.show : messages.hide)} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders-h' /></button>; | |||||
} | } | ||||
const hasTitle = icon && title; | const hasTitle = icon && title; | ||||
@@ -140,7 +140,7 @@ class Header extends ImmutablePureComponent { | |||||
} else { | } else { | ||||
actionBtn = ( | actionBtn = ( | ||||
<div className='account--action-button'> | <div className='account--action-button'> | ||||
<IconButton size={26} icon='pencil' title={intl.formatMessage(messages.edit_profile)} onClick={this.openEditProfile} /> | |||||
<IconButton size={26} icon='pencil-alt' title={intl.formatMessage(messages.edit_profile)} onClick={this.openEditProfile} /> | |||||
</div> | </div> | ||||
); | ); | ||||
} | } | ||||
@@ -150,7 +150,7 @@ class ListTimeline extends React.PureComponent { | |||||
> | > | ||||
<div className='column-header__links'> | <div className='column-header__links'> | ||||
<button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleEditClick}> | <button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleEditClick}> | ||||
<i className='fa fa-pencil' /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' /> | |||||
<i className='fa fa-pencil-alt' /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' /> | |||||
</button> | </button> | ||||
<button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleDeleteClick}> | <button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleDeleteClick}> | ||||
@@ -160,7 +160,7 @@ class ColumnsArea extends ImmutablePureComponent { | |||||
this.pendingIndex = null; | this.pendingIndex = null; | ||||
if (singleColumn) { | if (singleColumn) { | ||||
const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><i className='fa fa-pencil' /></Link>; | |||||
const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><i className='fa fa-pencil-alt' /></Link>; | |||||
return columnIndex !== -1 ? [ | return columnIndex !== -1 ? [ | ||||
<ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}> | <ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}> | ||||